Merge drm/drm-next into drm-intel-next
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 8 Jan 2021 11:03:51 +0000 (06:03 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 8 Jan 2021 11:03:51 +0000 (06:03 -0500)
sync-up to not fall too much behind.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1  2 
drivers/gpu/drm/i915/display/intel_ddi.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/gvt/handlers.c

Simple merge