From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 12 Aug 2025 12:58:37 +0000 (-0700)
Subject: Merge drm/drm-next into drm-xe-next
X-Git-Tag: v6.18-rc1~134^2~18^2~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca994e8922f25f7fed2075098f185cf198109eaa;p=thirdparty%2Flinux.git

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

Bring v6.17-rc1 to propagate commits from other subsystems, particularly
PCI, which has some new functions needed for SR-IOV integration.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---

ca994e8922f25f7fed2075098f185cf198109eaa
diff --cc drivers/gpu/drm/xe/display/xe_plane_initial.c
index 1fe06f4f9aca2,dcbc4b2d3fd94..00da1dff0c446
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@@ -19,9 -18,9 +18,10 @@@
  #include "intel_fb.h"
  #include "intel_fb_pin.h"
  #include "intel_frontbuffer.h"
+ #include "intel_plane.h"
  #include "intel_plane_initial.h"
  #include "xe_bo.h"
 +#include "xe_vram_types.h"
  #include "xe_wa.h"
  
  #include <generated/xe_wa_oob.h>