From: Lucas De Marchi Date: Fri, 28 Feb 2025 14:54:14 +0000 (-0800) Subject: Merge drm/drm-next into drm-xe-next X-Git-Tag: block-6.15-20250403~41^2~10^2~53 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0410c6121529409b08e81a77ae3ee58c657e2243;p=linux-block.git Merge drm/drm-next into drm-xe-next Sync to fix conlicts between drm-xe-next and drm-intel-next. Signed-off-by: Lucas De Marchi --- 0410c6121529409b08e81a77ae3ee58c657e2243 diff --cc drivers/gpu/drm/xe/display/xe_display.c index 279b786d64dc,02a413a07382..d5d453dc927a --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@@ -169,8 -169,7 +169,8 @@@ static void xe_display_fini(void *arg intel_hpd_poll_fini(xe); intel_hdcp_component_fini(display); - intel_audio_deinit(xe); + intel_audio_deinit(display); + intel_display_driver_remove(display); } int xe_display_init(struct xe_device *xe)