From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Wed, 26 Jun 2024 22:22:52 +0000 (-0400)
Subject: Merge drm/drm-next into drm-xe-next
X-Git-Tag: v6.11-rc1~141^2~16^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8664e7637388c013f4e953371d023ec7c2d84c8d;p=thirdparty%2Fkernel%2Flinux.git

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

Need to sync some header include that propagated through
drm-intel-next.

v2: After some changes in drm/drm-next

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

8664e7637388c013f4e953371d023ec7c2d84c8d
diff --cc drivers/gpu/drm/xe/xe_pci.c
index 08583fdd76439,973c14fbbbf32..21a1b7d2b2a94
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -340,9 -340,10 +340,10 @@@ static const struct xe_device_desc lnl_
  	.require_force_probe = true,
  };
  
 -static const struct xe_device_desc bmg_desc __maybe_unused = {
 +static const struct xe_device_desc bmg_desc = {
  	DGFX_FEATURES,
  	PLATFORM(BATTLEMAGE),
+ 	.has_display = true,
  	.require_force_probe = true,
  };