Merge drm/drm-next into drm-misc-next
authorThomas Zimmermann <tzimmermann@suse.de>
Thu, 10 Jun 2021 10:18:54 +0000 (12:18 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 10 Jun 2021 10:18:54 +0000 (12:18 +0200)
commit86441fa29e57940eeb00f35fefb1853c1fbe67bb
tree270384ffe46fed769d171870e4f7951cbc411bec
parentd098775ed44021293b1962dea61efb19297b8d02
parentc707b73f0cfb1acc94a20389aecde65e6385349b
Merge drm/drm-next into drm-misc-next

Backmerging to pick up the latest TTM patches plus conflict resolution.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
drivers/gpu/drm/i915/display/intel_display_types.h