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

Sync to v6.10-rc3.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/xe/xe_device.h
index 7524a71c0d84e28b80626f36f5931753b67c8fff,3ed14072d8d1c77cf26988fb5e70e10debfd316e..bb07f5669dbb3514925adc29f1bc18fbd95ba345
--- 1/drivers/gpu/drm/xe/xe_device.h
--- 2/drivers/gpu/drm/xe/xe_device.h
+++ b/drivers/gpu/drm/xe/xe_device.h
@@@ -167,6 -161,11 +161,13 @@@ void xe_device_snapshot_print(struct xe
  u64 xe_device_canonicalize_addr(struct xe_device *xe, u64 address);
  u64 xe_device_uncanonicalize_addr(struct xe_device *xe, u64 address);
  
 +void xe_device_td_flush(struct xe_device *xe);
 +
+ static inline bool xe_device_wedged(struct xe_device *xe)
+ {
+       return atomic_read(&xe->wedged.flag);
+ }
+ 
+ void xe_device_declare_wedged(struct xe_device *xe);
+ 
  #endif

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

diff --cc drivers/gpu/drm/xe/xe_ggtt.c
index 96fd8190ab7ebfc7ffd4e6c43e27c402cd6c7027,b01a670fecb82b74c15b075d7fbfcf840f4062c4..8ff91fd1b7c8015c49cbbe5e144ddca79b1bc14f
--- 1/drivers/gpu/drm/xe/xe_ggtt.c
--- 2/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@@ -8,8 -8,9 +8,9 @@@
  #include <linux/io-64-nonatomic-lo-hi.h>
  #include <linux/sizes.h>
  
+ #include <drm/drm_drv.h>
  #include <drm/drm_managed.h>
 -#include <drm/i915_drm.h>
 +#include <drm/intel/i915_drm.h>
  
  #include "regs/xe_gt_regs.h"
  #include "regs/xe_gtt_defs.h"

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

diff --cc drivers/gpu/drm/xe/xe_pci.c
index 0dd21e0da94eedd0c48e6cb22dda7fb0bfb37548,e84da0cbb8e9d51a045727d4651210f670c1d79a..973c14fbbbf329cb1c9015a1ece4cf2f4389d847
--- 1/drivers/gpu/drm/xe/xe_pci.c
--- 2/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -341,8 -342,7 +342,8 @@@ static const struct xe_device_desc lnl_
  
  static const struct xe_device_desc bmg_desc __maybe_unused = {
        DGFX_FEATURES,
-       PLATFORM(XE_BATTLEMAGE),
+       PLATFORM(BATTLEMAGE),
 +      .has_display = true,
        .require_force_probe = true,
  };
  

diff --cc drivers/misc/mei/pxp/mei_pxp.c
Simple merge

diff --cc drivers/platform/x86/intel_ips.c
Simple merge

diff --cc include/sound/hdaudio.h
Simple merge