From: Jani Nikula <jani.nikula@intel.com>
Date: Wed, 19 Jun 2024 08:38:31 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d754ed2821fd9675d203cb73c4afcd593e28b7d0;p=users%2Fwilly%2Fxarray.git

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

Sync to v6.10-rc3.

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

d754ed2821fd9675d203cb73c4afcd593e28b7d0
diff --cc drivers/gpu/drm/xe/xe_device.h
index 7524a71c0d84,3ed14072d8d1..bb07f5669dbb
--- a/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_ggtt.c
index 96fd8190ab7e,b01a670fecb8..8ff91fd1b7c8
--- a/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_pci.c
index 0dd21e0da94e,e84da0cbb8e9..973c14fbbbf3
--- a/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,
  };