Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 12 Oct 2021 16:03:58 +0000 (12:03 -0400)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 12 Oct 2021 16:03:58 +0000 (12:03 -0400)
commitd9f673051ab54dd5263fef6da97ef08feedaa754
tree6d7e19bd3345bd43e3488d17f6cb60ff16289b3d
parent814c8757115f9d7135126ac43d3a178b31e796dd
parent1176d15f0f6e556d54ced510ac4a91694960332b
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>
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_types.h
drivers/gpu/drm/i915/i915_reg.h