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>

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

diff --cc drivers/gpu/drm/i915/display/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_types.h
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_fbdev.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_plane.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
index 3c9d3a6220e1fd4ae09fa504dbbded1b8b654169,ee8e24497d2cfd85100e3f85d76562e4012e55d6..6cd94f400e3f7620d4a17d95150f5e338310b39c
--- 1/drivers/gpu/drm/i915/display/skl_universal_plane.c
--- 2/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"

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

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