From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Wed, 11 Dec 2024 20:06:05 +0000 (-0500)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: block-6.14-20240131~40^2~12^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e7f0a3a6f7339af55f1ca2c27131739d75569c08;p=linux-block.git

Merge drm/drm-next into drm-intel-next

Catching up with 6.13-rc2.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

e7f0a3a6f7339af55f1ca2c27131739d75569c08
diff --cc drivers/gpu/drm/xe/display/xe_display.c
index b8bfb666ebe8,b5502f335f53..317fa66adf18
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@@ -470,20 -446,25 +475,22 @@@ static void __xe_display_pm_resume(stru
  	if (has_display(xe))
  		drm_mode_config_reset(&xe->drm);
  
 -	intel_display_driver_init_hw(xe);
 -	intel_hpd_init(xe);
 +	intel_display_driver_init_hw(display);
  
  	if (!runtime && has_display(xe))
 -		intel_display_driver_resume_access(xe);
 +		intel_display_driver_resume_access(display);
  
 -	/* MST sideband requires HPD interrupts enabled */
 -	if (!runtime)
 -		intel_dp_mst_resume(xe);
 +	intel_hpd_init(xe);
  
  	if (!runtime && has_display(xe)) {
 -		intel_display_driver_resume(xe);
 +		intel_display_driver_resume(display);
  		drm_kms_helper_poll_enable(&xe->drm);
 -		intel_display_driver_enable_user_access(xe);
 +		intel_display_driver_enable_user_access(display);
- 		intel_hpd_poll_disable(xe);
  	}
  
+ 	if (has_display(xe))
+ 		intel_hpd_poll_disable(xe);
+ 
  	intel_opregion_resume(display);
  
  	if (!runtime)