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 <lucas.demarchi@intel.com>

diff --cc drivers/base/devres.c
Simple merge

diff --cc drivers/gpu/drm/xe/Makefile
Simple merge

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 279b786,02a413a..d5d453d
--- 1/drivers/gpu/drm/xe/display/xe_display.c
--- 2/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)

diff --cc drivers/gpu/drm/xe/xe_device.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_device_types.h
Simple merge

diff --cc drivers/gpu/drm/xe/xe_observation.c
Simple merge