Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel

# Conflicts:
#	drivers/gpu/drm/xe/display/xe_display.c
#	drivers/gpu/drm/xe/xe_gt_sriov_pf.c

diff --cc MAINTAINERS
index 1d892a88d4e0a5625e025cdee0a9209b2a6944d6,54529950ca508ca206db1e62d209d16ce3fde678..233ae79df4b3a30b3226053a0622829558c99e45
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7690,7 -7605,9 +7690,8 @@@ X:      drivers/gpu/drm/mediatek
  X:    drivers/gpu/drm/msm/
  X:    drivers/gpu/drm/nouveau/
  X:    drivers/gpu/drm/radeon/
 -X:    drivers/gpu/drm/renesas/rcar-du/
  X:    drivers/gpu/drm/tegra/
+ X:    drivers/gpu/drm/xe/
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <mripard@kernel.org>

diff --cc drivers/gpu/drm/i915/display/intel_display.c
index ab33792c98402133d939e1b3c8cd7d9c45877241,6f6a535ea486479cca9deb4824db7a207f03897f..065fdf6dbb88e3c4ac990b38e7f1575e0c9ca413
--- 1/drivers/gpu/drm/i915/display/intel_display.c
--- 2/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@@ -706,10 -817,10 +706,10 @@@ void intel_plane_disable_noatomic(struc
         * So disable underrun reporting before all the planes get disabled.
         */
        if (DISPLAY_VER(dev_priv) == 2 && !crtc_state->active_planes)
 -              intel_set_cpu_fifo_underrun_reporting(dev_priv, crtc->pipe, false);
 +              intel_set_cpu_fifo_underrun_reporting(display, crtc->pipe, false);
  
        intel_plane_disable_arm(NULL, plane, crtc_state);
-       intel_crtc_wait_for_next_vblank(crtc);
+       intel_plane_initial_vblank_wait(crtc);
  }
  
  unsigned int

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

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

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

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

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 96ba9595bf2acd6b6b23ca9ad95f2c76ca1609d4,7fef78f5606dfbb2ef122b2515f0f6311e28fc24..02a413a073824d82aa69cf4ae2a4c0ea07d79504
--- 1/drivers/gpu/drm/xe/display/xe_display.c
--- 2/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@@ -175,13 -167,12 +167,12 @@@ static void xe_display_fini(void *arg
        struct xe_device *xe = arg;
        struct intel_display *display = &xe->display;
  
-       if (!xe->info.probe_display)
-               return;
- 
-       intel_display_driver_remove_nogem(display);
+       intel_hpd_poll_fini(xe);
+       intel_hdcp_component_fini(display);
 -      intel_audio_deinit(xe);
++      intel_audio_deinit(display);
  }
  
- int xe_display_init_noaccel(struct xe_device *xe)
+ int xe_display_init(struct xe_device *xe)
  {
        struct intel_display *display = &xe->display;
        int err;

diff --cc drivers/gpu/drm/xe/display/xe_plane_initial.c
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_execlist.c
Simple merge

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