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

Catching up with 6.13-rc2.

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

diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_driver.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gpu_error.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_gvt_mmio_table.c
Simple merge

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index b8bfb666ebe8f798ceff33a5ce1ce1b21447cd5c,b5502f335f5313dd652a4f0d4b54e05916ca3172..317fa66adf189eb41ebe9fa662db907ac72f1756
--- 1/drivers/gpu/drm/xe/display/xe_display.c
--- 2/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)