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 <[email protected]>

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

diff --cc drivers/gpu/drm/i915/display/intel_display.c
index 0fe3c2f50971219d48316f64db7d0052848497aa,8faa7f729547d05f443184bcc567b034615ce2ac..9cf987ee143d52dab3194b084230bfeae6e98677
--- 1/drivers/gpu/drm/i915/display/intel_display.c
--- 2/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"

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

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