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)
Backmerging to pick up the latest TTM patches plus conflict resolution.

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