Skip to content

Commit 880b398

Browse files
ideakrodrigovivi
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] (cherry picked from commit a64e7e5) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 269a3f6 commit 880b398

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
@@ -318,7 +318,8 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
318318
intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
319319
if (has_display(xe)) {
320320
drm_kms_helper_poll_disable(&xe->drm);
321-
intel_display_driver_disable_user_access(xe);
321+
if (!runtime)
322+
intel_display_driver_disable_user_access(xe);
322323
}
323324

324325
if (!runtime)
@@ -330,7 +331,7 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
330331

331332
intel_hpd_cancel_work(xe);
332333

333-
if (has_display(xe))
334+
if (!runtime && has_display(xe))
334335
intel_display_driver_suspend_access(xe);
335336

336337
intel_encoder_suspend_all(&xe->display);
@@ -374,7 +375,7 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
374375
intel_display_driver_init_hw(xe);
375376
intel_hpd_init(xe);
376377

377-
if (has_display(xe))
378+
if (!runtime && has_display(xe))
378379
intel_display_driver_resume_access(xe);
379380

380381
/* MST sideband requires HPD interrupts enabled */
@@ -384,7 +385,8 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
384385

385386
if (has_display(xe)) {
386387
drm_kms_helper_poll_enable(&xe->drm);
387-
intel_display_driver_enable_user_access(xe);
388+
if (!runtime)
389+
intel_display_driver_enable_user_access(xe);
388390
}
389391
intel_hpd_poll_disable(xe);
390392

0 commit comments

Comments
 (0)