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>

diff --cc drivers/gpu/drm/xe/Makefile
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_types.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_pci.c
index 08583fdd7643987e5842a370643626a6234d02f3,973c14fbbbf329cb1c9015a1ece4cf2f4389d847..21a1b7d2b2a94b0e5e67cddbc389cff8e3d95096
--- 1/drivers/gpu/drm/xe/xe_pci.c
--- 2/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,
  };
  

diff --cc include/drm/intel/xe_pciids.h
Simple merge