From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2025 01:12:43 +0000 (+1100)
Subject: Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
X-Git-Tag: next-20250225~91
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=e294f6bef1cf0ec693e7923d9315f6f89e330983;p=linux%2F.git

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
---

e294f6bef1cf0ec693e7923d9315f6f89e330983
diff --cc MAINTAINERS
index 1d892a88d4e0,54529950ca50..233ae79df4b3
--- a/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 ab33792c9840,6f6a535ea486..065fdf6dbb88
--- a/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/xe/display/xe_display.c
index 96ba9595bf2a,7fef78f5606d..02a413a07382
--- a/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;