Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Fri, 29 Oct 2021 10:38:34 +0000 (13:38 +0300)
committerJani Nikula <jani.nikula@intel.com>
Fri, 29 Oct 2021 10:40:45 +0000 (13:40 +0300)
commitc1bb3a463dac815598362fb642a2746ff0e8f2f8
tree090d50f01c5c4e1e29b1d4398251745715e5a2a9
parentead3ea12e133416fbd800eedb2fb5d0faf2df431
parent31fa8cbce4664946a1688898410fee41ad05364d
Merge drm/drm-next into drm-intel-next

Backmerge to get the DP 2.0 MST changes merged to drm-next. This also
syncs us up to v5.15-rc7.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/gem/i915_gem_context.c
drivers/gpu/drm/i915/intel_pm.c