Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel

# Conflicts:
#	drivers/gpu/drm/xe/xe_device_types.h
#	drivers/gpu/drm/xe/xe_vm.c
#	drivers/gpu/drm/xe/xe_vm_types.h

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

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

diff --cc drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
index ea6b8e0f1f351d8a77d01840dfb6de7025b2a118,6a502e9f97d004101c1964b5bae6fee990df0dc7..ffaa4d2f1eed3d25fde17009af66ab8267d69978
--- 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
@@@ -79,9 -85,12 +79,10 @@@ static inline struct drm_i915_private *
  #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_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)
  
  #define IS_HASWELL_ULT(dev_priv) (dev_priv && 0)
  #define IS_BROADWELL_ULT(dev_priv) (dev_priv && 0)

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

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

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