Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Thu, 8 Apr 2021 07:22:14 +0000 (10:22 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 8 Apr 2021 07:22:14 +0000 (10:22 +0300)
commitd527353e4bceae6d59606ad21ad00916401d22ad
tree8ad569177aa89f15dcc485ee31d671cc98344ba8
parent70bfb30743d5da73058b0a2271e9c127a84fb494
parent9c0fed84d5750e1eea6c664e073ffa2534a17743
Merge drm/drm-next into drm-intel-next

Sync up with topic/i915-gem-next and drm-intel-gt-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_debugfs.c
drivers/gpu/drm/i915/i915_drv.c