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

[Stephen Rothwell]

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-intel tree and commit:

  8b3f09fb44a3 ("drm/xe: Fix xe_display_fini() calls")

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 96ba9595bf2a,ac0804726e55..000000000000
--- 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;

pgpqMXX8Qik1l.pgp
Description: OpenPGP digital signature