Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Thu, 1 Jul 2021 15:46:34 +0000 (18:46 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 1 Jul 2021 15:46:34 +0000 (18:46 +0300)
commite42c6c1bc8d5e70d7b2c8af534b0d33a2be48f0c
tree4b1109adc051c943ef3edd990f5a907a0836bdf8
parenta03e880a700d9e217f7660bfc3616d93783b6d8c
parent8a02ea42bc1d4c448caf1bab0e05899dad503f74
Merge drm/drm-next into drm-intel-next

Bring drm-intel-next closer to drm-next and drm-intel-gt-next for a more
feasible baseline for topic branches.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/display/intel_fbdev.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_pci.c
drivers/gpu/drm/i915/i915_reg.h