From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 May 2026 05:36:59 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2026-05-14' of https://gitlab.freedesktop.org/drm/i915... 
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1f863fe67343e2f45fc0af75ac94c3705bdf6537;p=thirdparty%2Flinux.git

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

- 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
---

1f863fe67343e2f45fc0af75ac94c3705bdf6537
diff --cc drivers/gpu/drm/i915/display/g4x_hdmi.h
index c37f4d2186697,0557322efe5a0..7586b1a6e0de3
--- a/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_display.h
index a43ada0c05024,43b2d6de833c7..45a90d2fe6ec5
--- a/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/xe/display/xe_fb_pin.c
index 948446346c53d,62855d35cd6ea..f93c98bec5b5f
--- a/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"