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

- A Revert of a Kconfig patch that broke some builds (Jani)
- New fb_pin abstraction for xe and i915 fb transparent handling (Ville, Tvrtko)
- Skip inactive MST connectors on HDCP cases (Suraj)
- Reduce redundant intel_panel_fixed_mode (Ankit)
- Some general fixes (Imre, Chaitanya)
- Reorganize display documentation (Jani)
- Start switching to display specific reg types (Jani)

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

diff --cc Documentation/gpu/drm-kms.rst
Simple merge

diff --cc Documentation/gpu/xe/index.rst
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/display/g4x_hdmi.h
index c37f4d21866979760f5377fa620a85e4e5b7cf19,0557322efe5a0cbf82f7c5fdd083a9548791ece9..7586b1a6e0de32552c75a3bc9ce2012345b248e4
--- 1/drivers/gpu/drm/i915/display/g4x_hdmi.h
--- 2/drivers/gpu/drm/i915/display/g4x_hdmi.h
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.h
@@@ -8,21 -8,21 +8,21 @@@
  
  #include <linux/types.h>
  
- #include "i915_reg_defs.h"
+ #include "intel_display_reg_defs.h"
  
  enum port;
 -struct drm_atomic_state;
 +struct drm_atomic_commit;
  struct drm_connector;
  struct intel_display;
  
  #ifdef I915
  bool g4x_hdmi_init(struct intel_display *display,
-                  i915_reg_t hdmi_reg, enum port port);
+                  intel_reg_t hdmi_reg, enum port port);
  int g4x_hdmi_connector_atomic_check(struct drm_connector *connector,
 -                                  struct drm_atomic_state *state);
 +                                  struct drm_atomic_commit *state);
  #else
  static inline bool g4x_hdmi_init(struct intel_display *display,
-                                i915_reg_t hdmi_reg, int port)
+                                intel_reg_t hdmi_reg, int port)
  {
        return false;
  }

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

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

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

diff --cc drivers/gpu/drm/i915/display/intel_display.h
index a43ada0c0502477072790954dcc5439a2354133c,43b2d6de833c73df31a299b7d015a4b2a17b613f..45a90d2fe6ec5de250bf15de1366d113237df8dc
--- 1/drivers/gpu/drm/i915/display/intel_display.h
--- 2/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@@ -27,10 -27,10 +27,10 @@@
  
  #include <drm/drm_util.h>
  
- #include "i915_reg_defs.h"
+ #include "intel_display_reg_defs.h"
  #include "intel_display_limits.h"
  
 -struct drm_atomic_state;
 +struct drm_atomic_commit;
  struct drm_device;
  struct drm_display_mode;
  struct drm_encoder;

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_dpll_mgr.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_plane.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/xe/display/xe_fb_pin.c
index 948446346c53d002e1309b249a7b10aa972065dd,62855d35cd6ea0519d33f8f2835248e0fe2eb647..f93c98bec5b5f7658a8ac6faaa044ba112c2f37a
--- 1/drivers/gpu/drm/xe/display/xe_fb_pin.c
--- 2/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@@ -13,8 -15,8 +15,9 @@@
  #include "xe_bo.h"
  #include "xe_device.h"
  #include "xe_display_vma.h"
+ #include "xe_fb_pin.h"
  #include "xe_ggtt.h"
 +#include "xe_pat.h"
  #include "xe_pm.h"
  #include "xe_vram_types.h"