kevin/linux
1
Fork 0
Code

drm/xe: Suspend/resume user access only during system s/r

Browse Source 
Enable/Disable user access only during system suspend/resume.
This should not happen during runtime s/r

v2: rebased

Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240823112148.327015-2-vinod.govindapillai@intel.com
(cherry picked from commit a64e7e5b05)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Imre Deak 2024-08-23 14:21:46 +03:00 committed by Rodrigo Vivi
parent 269a3f6084
commit 880b398288
No known key found for this signature in database
GPG Key ID: FA625F640EEB13CA
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/xe/display/xe_display.c
View File

@ -318,7 +318,8 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true); intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
if (has_display(xe)) { if (has_display(xe)) {
drm_kms_helper_poll_disable(&xe->drm); drm_kms_helper_poll_disable(&xe->drm);
intel_display_driver_disable_user_access(xe); if (!runtime)
intel_display_driver_disable_user_access(xe);
} }
if (!runtime) if (!runtime)
@ -330,7 +331,7 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
intel_hpd_cancel_work(xe); intel_hpd_cancel_work(xe);
if (has_display(xe)) if (!runtime && has_display(xe))
intel_display_driver_suspend_access(xe); intel_display_driver_suspend_access(xe);
intel_encoder_suspend_all(&xe->display); intel_encoder_suspend_all(&xe->display);
@ -374,7 +375,7 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
intel_display_driver_init_hw(xe); intel_display_driver_init_hw(xe);
intel_hpd_init(xe); intel_hpd_init(xe);
if (has_display(xe)) if (!runtime && has_display(xe))
intel_display_driver_resume_access(xe); intel_display_driver_resume_access(xe);
/* MST sideband requires HPD interrupts enabled */ /* MST sideband requires HPD interrupts enabled */
@ -384,7 +385,8 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
if (has_display(xe)) { if (has_display(xe)) {
drm_kms_helper_poll_enable(&xe->drm); drm_kms_helper_poll_enable(&xe->drm);
intel_display_driver_enable_user_access(xe); if (!runtime)
intel_display_driver_enable_user_access(xe);
} }
intel_hpd_poll_disable(xe); intel_hpd_poll_disable(xe);