Merge tag 'drm-misc-next-2022-09-09' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-block.git] / drivers / gpu / drm / i915 / display / intel_display.c

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index bf80b57ca63a93036d14212e4989a5f466d97da1..b8dc62203cd1fcbd893928ed2d15dfa66b7a2d94 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7531,6 +7531,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
        intel_atomic_commit_fence_wait(state);
 
        drm_atomic_helper_wait_for_dependencies(&state->base);
+       drm_dp_mst_atomic_wait_for_dependencies(&state->base);
 
        if (state->modeset)
                wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_MODESET);
@@ -8599,6 +8600,10 @@ out:
        return ret;
 }
 
+static const struct drm_mode_config_helper_funcs intel_mode_config_funcs = {
+       .atomic_commit_setup = drm_dp_mst_atomic_setup_commit,
+};
+
 static void intel_mode_config_init(struct drm_i915_private *i915)
 {
        struct drm_mode_config *mode_config = &i915->drm.mode_config;
@@ -8613,6 +8618,7 @@ static void intel_mode_config_init(struct drm_i915_private *i915)
        mode_config->prefer_shadow = 1;
 
        mode_config->funcs = &intel_mode_funcs;
+       mode_config->helper_private = &intel_mode_config_funcs;
 
        mode_config->async_page_flip = HAS_ASYNC_FLIPS(i915);