]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/display: Delay hpd_init resume
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 13 Nov 2024 22:50:14 +0000 (17:50 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 14 Nov 2024 15:57:51 +0000 (10:57 -0500)
Align with i915 and only initialize hotplugs after the display driver
access has been resumed.

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241113225016.208673-5-rodrigo.vivi@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/display/xe_display.c

index 2b77d706672d7ba77d1f1917761f6a5d572be632..af405f7b4d4561a36a3432440820ce84b7067ab9 100644 (file)
@@ -439,11 +439,12 @@ static void __xe_display_pm_resume(struct xe_device *xe, bool runtime)
                drm_mode_config_reset(&xe->drm);
 
        intel_display_driver_init_hw(xe);
-       intel_hpd_init(xe);
 
        if (!runtime && has_display(xe))
                intel_display_driver_resume_access(xe);
 
+       intel_hpd_init(xe);
+
        if (!runtime && has_display(xe)) {
                intel_display_driver_resume(xe);
                drm_kms_helper_poll_enable(&xe->drm);