From: Jani Nikula <jani.nikula@intel.com>
Date: Wed, 11 Sep 2024 07:57:18 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: v6.13-rc1~26^2~24^2~190
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=02189ca8411253aa1328e9dd6137a40e390a5b37;p=linux-block.git

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>
---

02189ca8411253aa1328e9dd6137a40e390a5b37
diff --cc drivers/gpu/drm/xe/display/xe_display.c
index 50e62f82313e,75736faf2a80..c0e9aa7a274f
--- a/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/drm_probe_helper.h>
- #include <drm/xe_drm.h>
+ #include <uapi/drm/xe_drm.h>
  
  #include "soc/intel_dram.h"
  #include "i915_drv.h"		/* FIXME: HAS_DISPLAY() depends on this */