Merge drm/drm-next into drm-xe-next

Avoid falling too far behind drm-next.

Signed-off-by: Thomas Hellström <[email protected]>

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

diff --cc drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
index 9ee694bf331f84425bdbdbae51f4d90eb5012fbc,ffaa4d2f1eed3d25fde17009af66ab8267d69978..cd4632276141b0c8eb7147da2bcfd6fd7eb565a0
--- 1/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
--- 2/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
@@@ -84,11 -78,8 +78,9 @@@ static inline struct drm_i915_private *
  #define IS_ROCKETLAKE(dev_priv)       IS_PLATFORM(dev_priv, XE_ROCKETLAKE)
  #define IS_DG1(dev_priv)        IS_PLATFORM(dev_priv, XE_DG1)
  #define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_S)
 -#define IS_ALDERLAKE_P(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_P)
 +#define IS_ALDERLAKE_P(dev_priv) (IS_PLATFORM(dev_priv, XE_ALDERLAKE_P) || \
 +                                IS_PLATFORM(dev_priv, XE_ALDERLAKE_N))
- #define IS_XEHPSDV(dev_priv) (dev_priv && 0)
  #define IS_DG2(dev_priv)      IS_PLATFORM(dev_priv, XE_DG2)
- #define IS_PONTEVECCHIO(dev_priv) IS_PLATFORM(dev_priv, XE_PVC)
  #define IS_METEORLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_METEORLAKE)
  #define IS_LUNARLAKE(dev_priv) IS_PLATFORM(dev_priv, XE_LUNARLAKE)
  #define IS_BATTLEMAGE(dev_priv)  IS_PLATFORM(dev_priv, XE_BATTLEMAGE)

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

diff --cc drivers/gpu/drm/xe/xe_device_types.h
Simple merge

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

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