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>

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

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

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

diff --cc drivers/gpu/drm/xe/display/xe_plane_initial.c
index 1fe06f4f9aca274e4e949d215476b6936b246ad9,dcbc4b2d3fd9441af532ca1259913d314cdb42f5..00da1dff0c446dd12a16d039e43428c4a566ebf9
--- 1/drivers/gpu/drm/xe/display/xe_plane_initial.c
--- 2/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>

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

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