Skip to content

Commit a64e7e5

Browse files
ideakvgovind2
authored andcommitted
drm/xe: Suspend/resume user access only during system s/r
Enable/Disable user access only during system suspend/resume. This should not happen during runtime s/r v2: rebased Reviewed-by: Arun R Murthy <[email protected]> Signed-off-by: Imre Deak <[email protected]> Signed-off-by: Vinod Govindapillai <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 501d943 commit a64e7e5

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/gpu/drm/xe/display/xe_display.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
323323
intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
324324
if (has_display(xe)) {
325325
drm_kms_helper_poll_disable(&xe->drm);
326-
intel_display_driver_disable_user_access(xe);
326+
if (!runtime)
327+
intel_display_driver_disable_user_access(xe);
327328
}
328329

329330
if (!runtime)
@@ -335,7 +336,7 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
335336

336337
intel_hpd_cancel_work(xe);
337338

338-
if (has_display(xe))
339+
if (!runtime && has_display(xe))
339340
intel_display_driver_suspend_access(xe);
340341

341342
intel_encoder_suspend_all(&xe->display);
@@ -381,7 +382,7 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
381382
intel_display_driver_init_hw(xe);
382383
intel_hpd_init(xe);
383384

384-
if (has_display(xe))
385+
if (!runtime && has_display(xe))
385386
intel_display_driver_resume_access(xe);
386387

387388
/* MST sideband requires HPD interrupts enabled */
@@ -391,7 +392,8 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
391392

392393
if (has_display(xe)) {
393394
drm_kms_helper_poll_enable(&xe->drm);
394-
intel_display_driver_enable_user_access(xe);
395+
if (!runtime)
396+
intel_display_driver_enable_user_access(xe);
395397
}
396398
intel_hpd_poll_disable(xe);
397399

0 commit comments

Comments
 (0)