From: Jani Nikula <jani.nikula@intel.com>
Date: Fri, 5 Dec 2025 08:29:22 +0000 (+0200)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d87d7c69b5a1136d7c354911f1fe7792b6a40fd;p=thirdparty%2Fkernel%2Flinux.git

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

Backmerge to get the topic/drm-intel-plane-color-pipeline branch
contents.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

6d87d7c69b5a1136d7c354911f1fe7792b6a40fd
diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
index 3c9d3a6220e1f,ee8e24497d2cf..6cd94f400e3f7
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@@ -9,7 -9,10 +9,9 @@@
  #include <drm/drm_fourcc.h>
  #include <drm/drm_print.h>
  
 -#include "pxp/intel_pxp.h"
  #include "intel_bo.h"
+ #include "intel_color.h"
+ #include "intel_color_pipeline.h"
  #include "intel_de.h"
  #include "intel_display_irq.h"
  #include "intel_display_regs.h"