Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
Syncing drm-intel-next and drm-intel-gt-next to unblock ADL enabling.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1  2 
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_drv.h

Simple merge
Simple merge