Merge drm/drm-next into drm-intel-next

Sync the branches to resolve the conflict reported in the below link.

Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 50e62f82313ed2a6f059aa5c35678736af87f466,75736faf2a8028cc822eff2d75ef83dcc9276784..c0e9aa7a274f1993ff09c2199c2951c83a902051
--- 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
@@@ -10,8 -10,7 +10,8 @@@
  
  #include <drm/drm_drv.h>
  #include <drm/drm_managed.h>
- #include <drm/xe_drm.h>
 +#include <drm/drm_probe_helper.h>
+ #include <uapi/drm/xe_drm.h>
  
  #include "soc/intel_dram.h"
  #include "i915_drv.h"         /* FIXME: HAS_DISPLAY() depends on this */