drm/atomic: Change state pointers to a more meaningful name

The state pointer found in the struct drm_atomic_state internals for
most object is a bit ambiguous, and confusing when those internals also
have old state and new state.

After the recent cleanups, the state pointer only use is to point to the
state we need to free when destroying the atomic state.

We can thus rename it something less ambiguous, and hopefully more
meaningful.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20251008-drm-rename-state-v2-1-49b490b2676a@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 0d03e324d5b9b403c4fe2783f228e8ce53686e17..fe41494635c54ee58354b51b53449835a7f47328 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -12450,7 +12450,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
                                int j = state->num_private_objs-1;
 
                                dm_atomic_destroy_state(obj,
-                                               state->private_objs[i].state);
+                                               state->private_objs[i].state_to_destroy);
 
                                /* If i is not at the end of the array then the
                                 * last element needs to be moved to where i was
@@ -12461,7 +12461,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
                                                state->private_objs[j];
 
                                state->private_objs[j].ptr = NULL;
-                               state->private_objs[j].state = NULL;
+                               state->private_objs[j].state_to_destroy = NULL;
                                state->private_objs[j].old_state = NULL;
                                state->private_objs[j].new_state = NULL;
 

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 0fda567c390057b10bce691d9ddc11308088d92e..be2cb6e43cb07fbe553d1ab875911253be628d1a 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -207,9 +207,9 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
                        continue;
 
                connector->funcs->atomic_destroy_state(connector,
-                                                      state->connectors[i].state);
+                                                      state->connectors[i].state_to_destroy);
                state->connectors[i].ptr = NULL;
-               state->connectors[i].state = NULL;
+               state->connectors[i].state_to_destroy = NULL;
                state->connectors[i].old_state = NULL;
                state->connectors[i].new_state = NULL;
                drm_connector_put(connector);
@@ -222,10 +222,10 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
                        continue;
 
                crtc->funcs->atomic_destroy_state(crtc,
-                                                 state->crtcs[i].state);
+                                                 state->crtcs[i].state_to_destroy);
 
                state->crtcs[i].ptr = NULL;
-               state->crtcs[i].state = NULL;
+               state->crtcs[i].state_to_destroy = NULL;
                state->crtcs[i].old_state = NULL;
                state->crtcs[i].new_state = NULL;
 
@@ -242,9 +242,9 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
                        continue;
 
                plane->funcs->atomic_destroy_state(plane,
-                                                  state->planes[i].state);
+                                                  state->planes[i].state_to_destroy);
                state->planes[i].ptr = NULL;
-               state->planes[i].state = NULL;
+               state->planes[i].state_to_destroy = NULL;
                state->planes[i].old_state = NULL;
                state->planes[i].new_state = NULL;
        }
@@ -253,9 +253,9 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
                struct drm_private_obj *obj = state->private_objs[i].ptr;
 
                obj->funcs->atomic_destroy_state(obj,
-                                                state->private_objs[i].state);
+                                                state->private_objs[i].state_to_destroy);
                state->private_objs[i].ptr = NULL;
-               state->private_objs[i].state = NULL;
+               state->private_objs[i].state_to_destroy = NULL;
                state->private_objs[i].old_state = NULL;
                state->private_objs[i].new_state = NULL;
        }
@@ -361,7 +361,7 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,
        if (!crtc_state)
                return ERR_PTR(-ENOMEM);
 
-       state->crtcs[index].state = crtc_state;
+       state->crtcs[index].state_to_destroy = crtc_state;
        state->crtcs[index].old_state = crtc->state;
        state->crtcs[index].new_state = crtc_state;
        state->crtcs[index].ptr = crtc;
@@ -546,7 +546,7 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,
        if (!plane_state)
                return ERR_PTR(-ENOMEM);
 
-       state->planes[index].state = plane_state;
+       state->planes[index].state_to_destroy = plane_state;
        state->planes[index].ptr = plane;
        state->planes[index].old_state = plane->state;
        state->planes[index].new_state = plane_state;
@@ -858,7 +858,7 @@ drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
        if (!obj_state)
                return ERR_PTR(-ENOMEM);
 
-       state->private_objs[index].state = obj_state;
+       state->private_objs[index].state_to_destroy = obj_state;
        state->private_objs[index].old_state = obj->state;
        state->private_objs[index].new_state = obj_state;
        state->private_objs[index].ptr = obj;
@@ -1161,7 +1161,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,
                return ERR_PTR(-ENOMEM);
 
        drm_connector_get(connector);
-       state->connectors[index].state = connector_state;
+       state->connectors[index].state_to_destroy = connector_state;
        state->connectors[index].old_state = connector->state;
        state->connectors[index].new_state = connector_state;
        state->connectors[index].ptr = connector;

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index d5ebe6ea0acbc5a08aef7fa41ecb9ed5d8fa8e80..5a473a274ff06d7ab83039e0a6328e1372b80a00 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3236,7 +3236,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
                old_conn_state->state = state;
                new_conn_state->state = NULL;
 
-               state->connectors[i].state = old_conn_state;
+               state->connectors[i].state_to_destroy = old_conn_state;
                connector->state = new_conn_state;
        }
 
@@ -3246,7 +3246,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
                old_crtc_state->state = state;
                new_crtc_state->state = NULL;
 
-               state->crtcs[i].state = old_crtc_state;
+               state->crtcs[i].state_to_destroy = old_crtc_state;
                crtc->state = new_crtc_state;
 
                if (new_crtc_state->commit) {
@@ -3266,7 +3266,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
                old_plane_state->state = state;
                new_plane_state->state = NULL;
 
-               state->planes[i].state = old_plane_state;
+               state->planes[i].state_to_destroy = old_plane_state;
                plane->state = new_plane_state;
        }
        drm_panic_unlock(state->dev, flags);
@@ -3277,7 +3277,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
                old_obj_state->state = state;
                new_obj_state->state = NULL;
 
-               state->private_objs[i].state = old_obj_state;
+               state->private_objs[i].state_to_destroy = old_obj_state;
                obj->state = new_obj_state;
        }
 

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index c8ab2163bf658cd06b12a8dabada7c088a328654..155e82f87e4d47161475b57fc28762d7ba8fd206 100644 (file)
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -161,7 +161,7 @@ struct __drm_planes_state {
        struct drm_plane *ptr;
 
        /**
-        * @state:
+        * @state_to_destroy:
         *
         * Used to track the @drm_plane_state we will need to free when
         * tearing down the associated &drm_atomic_state in
@@ -173,7 +173,7 @@ struct __drm_planes_state {
         * the same state than @new_state. After a commit, it points to
         * the same state than @old_state.
         */
-       struct drm_plane_state *state;
+       struct drm_plane_state *state_to_destroy;
 
        struct drm_plane_state *old_state, *new_state;
 };
@@ -182,7 +182,7 @@ struct __drm_crtcs_state {
        struct drm_crtc *ptr;
 
        /**
-        * @state:
+        * @state_to_destroy:
         *
         * Used to track the @drm_crtc_state we will need to free when
         * tearing down the associated &drm_atomic_state in
@@ -194,7 +194,7 @@ struct __drm_crtcs_state {
         * the same state than @new_state. After a commit, it points to
         * the same state than @old_state.
         */
-       struct drm_crtc_state *state;
+       struct drm_crtc_state *state_to_destroy;
 
        struct drm_crtc_state *old_state, *new_state;
 
@@ -216,7 +216,7 @@ struct __drm_connnectors_state {
        struct drm_connector *ptr;
 
        /**
-        * @state:
+        * @state_to_destroy:
         *
         * Used to track the @drm_connector_state we will need to free
         * when tearing down the associated &drm_atomic_state in
@@ -228,7 +228,7 @@ struct __drm_connnectors_state {
         * the same state than @new_state. After a commit, it points to
         * the same state than @old_state.
         */
-       struct drm_connector_state *state;
+       struct drm_connector_state *state_to_destroy;
 
        struct drm_connector_state *old_state, *new_state;
 
@@ -393,7 +393,7 @@ struct __drm_private_objs_state {
        struct drm_private_obj *ptr;
 
        /**
-        * @state:
+        * @state_to_destroy:
         *
         * Used to track the @drm_private_state we will need to free
         * when tearing down the associated &drm_atomic_state in
@@ -405,7 +405,7 @@ struct __drm_private_objs_state {
         * the same state than @new_state. After a commit, it points to
         * the same state than @old_state.
         */
-       struct drm_private_state *state;
+       struct drm_private_state *state_to_destroy;
 
        struct drm_private_state *old_state, *new_state;
 };