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)
commitba217b77772a16ad93c8534121b4859e731db384
treeed45091c22d72284e3cebdc3124e2991e18db566
parent777e687a0c6512179d7e333a633d4c6fa5046233
parentfb5cfcaa2efbb4c71abb1dfbc8f4da727e0bfd89
Merge drm/drm-next into drm-intel-next

Syncing drm-intel-next and drm-intel-gt-next to unblock ADL enabling.

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