Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 26 May 2021 13:40:54 +0000 (09:40 -0400)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 26 May 2021 13:40:54 +0000 (09:40 -0400)
commitabfe041de01f16d74df522d92cf5e3f6523971dd
tree1cd997085149cf09e110baa4f98725ed18ffa05a
parent7bc188cc2c8c7b21bfa0782f0d22bbf245ce1f63
parent9a91e5e0af5e03940d0eec72c36364a1701de240
Merge drm/drm-next into drm-intel-next

Getting in sync with -rc2

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/display/intel_atomic.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_dp_link_training.c
drivers/gpu/drm/i915/i915_drv.c