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

Need to take some Xe bo definition in here before
we can add the BMG display 64k aligned size restrictions.

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

diff --cc drivers/gpu/drm/i915/display/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_fbc.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.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 da090f0e592f86a2330ee64f369b65eb5a1224d8,3c4a3c91377a1428c3d5c72ebe816d3de3f77dd9..b42aa304c4e99af987ed8b33105e8ec82ac9a31d
--- 1/drivers/gpu/drm/xe/xe_pci.c
--- 2/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@@ -828,11 -831,12 +831,11 @@@ static int xe_pci_probe(struct pci_dev 
                xe->info.media_verx100 % 100,
                str_yes_no(xe->info.enable_display),
                xe->info.dma_mask_size, xe->info.tile_count,
-               xe->info.has_heci_gscfi);
+               xe->info.has_heci_gscfi, xe->info.has_heci_cscfi);
  
 -      drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n",
 +      drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, B:%s)\n",
                xe_step_name(xe->info.step.graphics),
                xe_step_name(xe->info.step.media),
 -              xe_step_name(xe->info.step.display),
                xe_step_name(xe->info.step.basedie));
  
        drm_dbg(&xe->drm, "SR-IOV support: %s (mode: %s)\n",