Subject: linux-next: manual merge of the drm-xe tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Feb 2025 14:27:18 +1100

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/display/xe_display.c

between commit:

  1b242ceec536 ("drm/i915/audio: convert to struct intel_display")

from the drm tree and commit:

  d41d048043c4 ("drm/xe/display: Drop xe_display_driver_remove()")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 02a413a07382,279b786d64dc..000000000000
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@@ -169,7 -169,8 +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)