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)
commit10205618052908770451acd33eaeaa7685e97ed2
tree4d025943e32f343fa917db7abed8a606faa17775
parent6fdb335f1c9c0845b50625de1624d8445c4c4a07
parentcb3cfbf79aff7decb4e5ee69a7c74864497f61dc
Merge drm/drm-next into drm-intel-next

sync-up to not fall too much behind.

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