From: Dave Airlie Date: Mon, 14 Apr 2025 19:06:46 +0000 (+1000) Subject: Merge tag 'drm-intel-next-2025-04-11' of https://gitlab.freedesktop.org/drm/i915... X-Git-Tag: v6.16-rc1~144^2~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b60301774a8fe6c30b14a95104ec099290a2e904;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'drm-intel-next-2025-04-11' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next Cross-subsystem Changes: - Update GVT MAINTAINERS (Jani) Driver Changes: - Updates for xe3lpd display (Gustavo) - Fix link training interrupted by HPD pulse (Imre) - Watermark bound checks for DSC (Ankit) - VRR Refactor and other fixes and improvements (Ankit) - More conversions towards intel_display struct (Gustavo, Jani) - Other clean-up patches towards a display separation (Jani) - Maintain asciibetical order for HAS_* macros (Ankit) - Fixes around probe/initialization (Janusz) - Fix build and doc build issue (Yue, Rodrigo) - DSI related fixes (Suraj, William, Jani) - Improve DC6 entry counter (Mohammed) - Fix xe2hpd memory type identification (Vivek) - PSR related fixes and improvements (Animesh, Jouni) - DP MST related fixes and improvements (Imre) - Fix scanline_offset for LNL+/BMG+ (Ville) - Some gvt related fixes and changes (Ville, Jani) - Some PLL code adjustment (Ville) - Display wa addition (Vinod) - DRAM type logging (Lucas) - Pimp the initial FB readout (Ville) - Some sagv/bw cleanup (Ville) - Remove i915_display_capabilities debugfs entry (Jani) - Move PCH type to display caps debugfs entry (Jani) Signed-off-by: Dave Airlie From: Rodrigo Vivi Link: https://lore.kernel.org/r/Z_kTqPX5Mjruq1pL@intel.com --- b60301774a8fe6c30b14a95104ec099290a2e904 diff --cc drivers/gpu/drm/xe/display/xe_display.c index 0b0aca7a25afd,7ddda8f5b1c48..20c3bcd953b70 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@@ -173,10 -173,9 +173,10 @@@ static void xe_display_fini(void *arg struct xe_device *xe = arg; struct intel_display *display = &xe->display; - intel_hpd_poll_fini(xe); + intel_hpd_poll_fini(display); intel_hdcp_component_fini(display); intel_audio_deinit(display); + intel_display_driver_remove(display); } int xe_display_init(struct xe_device *xe)