mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git
synced 2026-04-18 06:34:27 -04:00
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>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user