Align with i915 and only initialize hotplugs after the display driver
access has been resumed.

Reviewed-by: Jonathan Cavitt <jonathan.cav...@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c 
b/drivers/gpu/drm/xe/display/xe_display.c
index 3778a7a0e52d..fe4d7c210744 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -444,11 +444,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);
-- 
2.47.0

Reply via email to