]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/atomic-helper: Fix commit_tail state variable name
authorMaxime Ripard <mripard@kernel.org>
Thu, 13 Feb 2025 14:43:25 +0000 (15:43 +0100)
committerMaxime Ripard <mripard@kernel.org>
Wed, 19 Feb 2025 15:59:13 +0000 (16:59 +0100)
Even though the commit_tail () drm_atomic_state parameter is called
old_state, it's actually the state being committed which is confusing.

It's even more confusing since the atomic_commit_tail hook being called
by commit_tail() parameter is called state.

Let's rename the variable from old_state to state to make it less
confusing.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250213-bridge-connector-v3-6-e71598f49c8f@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
drivers/gpu/drm/drm_atomic_helper.c

index fd3d14592663b8c04481cb3caf2011ee08f793db..f8ab33fec5d02ca23929f624032086288de97f87 100644 (file)
@@ -1830,9 +1830,9 @@ void drm_atomic_helper_commit_tail_rpm(struct drm_atomic_state *old_state)
 }
 EXPORT_SYMBOL(drm_atomic_helper_commit_tail_rpm);
 
-static void commit_tail(struct drm_atomic_state *old_state)
+static void commit_tail(struct drm_atomic_state *state)
 {
-       struct drm_device *dev = old_state->dev;
+       struct drm_device *dev = state->dev;
        const struct drm_mode_config_helper_funcs *funcs;
        struct drm_crtc_state *new_crtc_state;
        struct drm_crtc *crtc;
@@ -1854,33 +1854,33 @@ static void commit_tail(struct drm_atomic_state *old_state)
         */
        start = ktime_get();
 
-       drm_atomic_helper_wait_for_fences(dev, old_state, false);
+       drm_atomic_helper_wait_for_fences(dev, state, false);
 
-       drm_atomic_helper_wait_for_dependencies(old_state);
+       drm_atomic_helper_wait_for_dependencies(state);
 
        /*
         * We cannot safely access new_crtc_state after
         * drm_atomic_helper_commit_hw_done() so figure out which crtc's have
         * self-refresh active beforehand:
         */
-       for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i)
+       for_each_new_crtc_in_state(state, crtc, new_crtc_state, i)
                if (new_crtc_state->self_refresh_active)
                        new_self_refresh_mask |= BIT(i);
 
        if (funcs && funcs->atomic_commit_tail)
-               funcs->atomic_commit_tail(old_state);
+               funcs->atomic_commit_tail(state);
        else
-               drm_atomic_helper_commit_tail(old_state);
+               drm_atomic_helper_commit_tail(state);
 
        commit_time_ms = ktime_ms_delta(ktime_get(), start);
        if (commit_time_ms > 0)
-               drm_self_refresh_helper_update_avg_times(old_state,
+               drm_self_refresh_helper_update_avg_times(state,
                                                 (unsigned long)commit_time_ms,
                                                 new_self_refresh_mask);
 
-       drm_atomic_helper_commit_cleanup_done(old_state);
+       drm_atomic_helper_commit_cleanup_done(state);
 
-       drm_atomic_state_put(old_state);
+       drm_atomic_state_put(state);
 }
 
 static void commit_work(struct work_struct *work)