[PATCH v2 14/35] drm/atomic-helper: Change parameter name of drm_atomic_helper_update_legacy_modeset_state()

[Maxime Ripard]

drm_atomic_helper_update_legacy_modeset_state() updates all the legacy
modeset pointers a connector, encoder or CRTC might have with the ones
being setup by a given commit. It takes the drm_atomic_state being
committed as a parameter.

However, that parameter name is called (and documented) as old_state,
which is pretty confusing. Let's rename that variable as state.

Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
 drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c 
b/drivers/gpu/drm/drm_atomic_helper.c
index 
0d561b5c249a79a723e047f061d4103ef7742e87..50b3fdb033eaae8e852a4fd298d2e958be1201f3
 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1265,11 +1265,11 @@ disable_outputs(struct drm_device *dev, struct 
drm_atomic_state *state)
 }
 
 /**
  * drm_atomic_helper_update_legacy_modeset_state - update legacy modeset state
  * @dev: DRM device
- * @old_state: atomic state object with old state structures
+ * @state: atomic state object being committed
  *
  * This function updates all the various legacy modeset state pointers in
  * connectors, encoders and CRTCs.
  *
  * Drivers can use this for building their own atomic commit if they don't have
@@ -1281,20 +1281,20 @@ disable_outputs(struct drm_device *dev, struct 
drm_atomic_state *state)
  * the legacy state pointers are only really useful for transitioning an
  * existing driver to the atomic world.
  */
 void
 drm_atomic_helper_update_legacy_modeset_state(struct drm_device *dev,
-                                             struct drm_atomic_state 
*old_state)
+                                             struct drm_atomic_state *state)
 {
        struct drm_connector *connector;
        struct drm_connector_state *old_conn_state, *new_conn_state;
        struct drm_crtc *crtc;
        struct drm_crtc_state *new_crtc_state;
        int i;
 
        /* clear out existing links and update dpms */
-       for_each_oldnew_connector_in_state(old_state, connector, 
old_conn_state, new_conn_state, i) {
+       for_each_oldnew_connector_in_state(state, connector, old_conn_state, 
new_conn_state, i) {
                if (connector->encoder) {
                        WARN_ON(!connector->encoder->crtc);
 
                        connector->encoder->crtc = NULL;
                        connector->encoder = NULL;
@@ -1311,11 +1311,11 @@ drm_atomic_helper_update_legacy_modeset_state(struct 
drm_device *dev,
                        connector->dpms = mode;
                }
        }
 
        /* set new links */
-       for_each_new_connector_in_state(old_state, connector, new_conn_state, 
i) {
+       for_each_new_connector_in_state(state, connector, new_conn_state, i) {
                if (!new_conn_state->crtc)
                        continue;
 
                if (WARN_ON(!new_conn_state->best_encoder))
                        continue;
@@ -1323,19 +1323,19 @@ drm_atomic_helper_update_legacy_modeset_state(struct 
drm_device *dev,
                connector->encoder = new_conn_state->best_encoder;
                connector->encoder->crtc = new_conn_state->crtc;
        }
 
        /* set legacy state in the crtc structure */
-       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) {
                struct drm_plane *primary = crtc->primary;
                struct drm_plane_state *new_plane_state;
 
                crtc->mode = new_crtc_state->mode;
                crtc->enabled = new_crtc_state->enable;
 
                new_plane_state =
-                       drm_atomic_get_new_plane_state(old_state, primary);
+                       drm_atomic_get_new_plane_state(state, primary);
 
                if (new_plane_state && new_plane_state->crtc == crtc) {
                        crtc->x = new_plane_state->src_x >> 16;
                        crtc->y = new_plane_state->src_y >> 16;
                }

-- 
2.48.0