From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Tue, 12 Oct 2021 16:03:58 +0000 (-0400)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d9f673051ab54dd5263fef6da97ef08feedaa754;p=linux.git

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

Need to resync drm-intel-next with TTM and PXP stuff from
drm-intel-gt-next that is now in drm/drm-next.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---

d9f673051ab54dd5263fef6da97ef08feedaa754
diff --cc drivers/gpu/drm/i915/display/intel_display.c
index 0fe3c2f509712,8faa7f729547d..9cf987ee143d5
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@@ -68,8 -68,11 +68,10 @@@
  #include "gem/i915_gem_lmem.h"
  #include "gem/i915_gem_object.h"
  
 -#include "gt/intel_rps.h"
  #include "gt/gen8_ppgtt.h"
  
+ #include "pxp/intel_pxp.h"
+ 
  #include "g4x_dp.h"
  #include "g4x_hdmi.h"
  #include "i915_drv.h"