Merge tag 'drm-intel-next-2026-05-05' of https://gitlab.freedesktop.org/drm/i915...

 - Enable PIPEDMC_ERROR interrupt (Dibin)
 - Some general display fixes and cleanups (Ville, Nemesa,
   Suraj, Dibin, Arun, Desnes, Juha-Pekka, Vidya, Julian)
 - More refactor to split display code (Jani, Ville, Luca)
 - Panel Replay BW optimization (Animesh)
 - Integrate the sharpness filter properly into the scaler (Ville)
 - Watermark/SAGV fixes/cleanups/etc (Ville)
 - Restructure DP/HDMI sink format handling (Ville)
 - Eliminate FB usage from low level pinning code (Ville)
 - Some initial prep patches for always enable AS SDP (Ankit)
 - Many PSR related fixes (Jouni)
 - Fix MST VCPI lookup and modeset-lock splat (Suraj)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/afot1cjSpeAjYzg2@intel.com

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

diff --cc drivers/gpu/drm/i915/Kconfig.debug
Simple merge

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

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

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

diff --cc drivers/gpu/drm/i915/display/intel_display_core.h
index d9424d954b1818f4f472f02d5c5eb5d42d5abe75,796517e7bc6c261570cb3b5d1127b83ed70307d7..76745ce6a716ef0c636df30eaed1bdd8cdecc7cb
--- 1/drivers/gpu/drm/i915/display/intel_display_core.h
--- 2/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@@ -559,12 -558,15 +558,15 @@@ struct intel_display 
                unsigned long mask;
        } quirks;
  
+       struct {
+               u32 count;
+       } reset;
+ 
        struct {
                /* restore state for suspend/resume and display reset */
 -              struct drm_atomic_state *modeset_state;
 +              struct drm_atomic_commit *modeset_state;
                struct drm_modeset_acquire_ctx reset_ctx;
                /* modeset stuck tracking for reset */
-               atomic_t pending_fb_pin;
                u32 saveDSPARB;
                u32 saveSWF0[16];
                u32 saveSWF1[16];

diff --cc drivers/gpu/drm/i915/display/intel_display_reset.c
index 9481165ecfec409ad58cf72917deb5bea760740a,fb3ac52a0acf18a59c397f352fdbcb4d30b4426b..504ec7043cd914b6e1bdb79313cd82922ff81435
--- 1/drivers/gpu/drm/i915/display/intel_display_reset.c
--- 2/drivers/gpu/drm/i915/display/intel_display_reset.c
+++ b/drivers/gpu/drm/i915/display/intel_display_reset.c
@@@ -16,28 -18,23 +18,23 @@@
  #include "intel_hotplug.h"
  #include "intel_pps.h"
  
+ bool intel_display_reset_supported(struct intel_display *display)
+ {
+       return display && HAS_DISPLAY(display);
+ }
+ 
  bool intel_display_reset_test(struct intel_display *display)
  {
-       return display->params.force_reset_modeset_test;
+       return display && HAS_DISPLAY(display) &&
+               display->params.force_reset_modeset_test;
  }
  
- /* returns true if intel_display_reset_finish() needs to be called */
- bool intel_display_reset_prepare(struct intel_display *display,
-                                modeset_stuck_fn modeset_stuck, void *context)
+ void intel_display_reset_prepare(struct intel_display *display)
  {
        struct drm_modeset_acquire_ctx *ctx = &display->restore.reset_ctx;
 -      struct drm_atomic_state *state;
 +      struct drm_atomic_commit *state;
        int ret;
  
-       if (!HAS_DISPLAY(display))
-               return false;
- 
-       if (atomic_read(&display->restore.pending_fb_pin)) {
-               drm_dbg_kms(display->drm,
-                           "Modeset potentially stuck, unbreaking through wedging\n");
-               modeset_stuck(context);
-       }
- 
        /*
         * Need mode_config.mutex so that we don't
         * trample ongoing ->detect() and whatnot.
@@@ -67,25 -64,21 +64,21 @@@
        if (ret) {
                drm_err(display->drm, "Suspending crtc's failed with %i\n",
                        ret);
 -              drm_atomic_state_put(state);
 +              drm_atomic_commit_put(state);
-               return true;
+               return;
        }
  
+       display->reset.count++;
        display->restore.modeset_state = state;
        state->acquire_ctx = ctx;
- 
-       return true;
  }
  
  void intel_display_reset_finish(struct intel_display *display, bool test_only)
  {
        struct drm_modeset_acquire_ctx *ctx = &display->restore.reset_ctx;
 -      struct drm_atomic_state *state;
 +      struct drm_atomic_commit *state;
        int ret;
  
-       if (!HAS_DISPLAY(display))
-               return;
- 
        state = fetch_and_zero(&display->restore.modeset_state);
        if (!state)
                goto unlock;

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/display/intel_modeset_setup.c
index 9a0f89f1a1f2a6409a44496baf3c81b1e9308020,4c646b1bd0ee098bfa348068c32a5caeecc93069..e88082c8caace86b01652ca9b9f162dcc00c1005
--- 1/drivers/gpu/drm/i915/display/intel_modeset_setup.c
--- 2/drivers/gpu/drm/i915/display/intel_modeset_setup.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
@@@ -83,9 -83,9 +83,9 @@@ static void intel_crtc_disable_noatomic
                drm_WARN_ON(display->drm, IS_ERR(temp_crtc_state) || ret);
        }
  
-       display->funcs.display->crtc_disable(to_intel_atomic_state(state), crtc);
+       display->modeset.funcs->crtc_disable(to_intel_atomic_state(state), crtc);
  
 -      drm_atomic_state_put(state);
 +      drm_atomic_commit_put(state);
  
        drm_dbg_kms(display->drm,
                    "[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n",

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

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

diff --cc drivers/gpu/drm/xe/Makefile
Simple merge

diff --cc drivers/gpu/drm/xe/display/xe_fb_pin.c
Simple merge

diff --cc include/drm/display/drm_dp_tunnel.h
Simple merge