Merge drm/drm-next into drm-intel-next
authorJani Nikula <jani.nikula@intel.com>
Mon, 12 Sep 2022 08:11:02 +0000 (11:11 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 12 Sep 2022 08:14:20 +0000 (11:14 +0300)
commit6f3562b3bca078b40aa198db8fdc68439b7b0399
treebca5b69f6318824e66f9f6aa9a7f1eea0f216be3
parent3fecf93c86087d1e1a9db28d3423db276639e776
parent89b03aeaef16f8ab48c10c399f97c836bdbae838
Merge drm/drm-next into drm-intel-next

Backmerge to sync the DP MST atomic changes to drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/i9xx_plane.c
drivers/gpu/drm/i915/display/intel_atomic.c
drivers/gpu/drm/i915/display/intel_atomic_plane.c
drivers/gpu/drm/i915/display/intel_cursor.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_dp.c
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/display/intel_hdcp.c
drivers/gpu/drm/i915/display/skl_universal_plane.c