]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/atomic: Convert drm_atomic_get_private_obj_state() to use new plane state
authorMaxime Ripard <mripard@kernel.org>
Tue, 30 Sep 2025 10:59:53 +0000 (12:59 +0200)
committerMaxime Ripard <mripard@kernel.org>
Mon, 6 Oct 2025 11:59:23 +0000 (13:59 +0200)
The drm_atomic_get_private_obj_state() function tries to find if a
private_obj had already been allocated and was part of the given
drm_atomic_state. If one is found, it returns the existing state
pointer.

At the point in time where drm_atomic_get_private_obj_state() can be
called (ie, during atomic_check), the existing state is the new state
and we can thus replace the hand-crafted logic by a call to
drm_atomic_get_new_private_obj_state().

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/20250930-drm-no-more-existing-state-v5-38-eeb9e1287907@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>
drivers/gpu/drm/drm_atomic.c

index eb55bdf64fc7a9fe05e72a0dbcab8ae97de46a09..0fda567c390057b10bce691d9ddc11308088d92e 100644 (file)
@@ -831,14 +831,14 @@ struct drm_private_state *
 drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
                                 struct drm_private_obj *obj)
 {
-       int index, num_objs, i, ret;
+       int index, num_objs, ret;
        size_t size;
        struct __drm_private_objs_state *arr;
        struct drm_private_state *obj_state;
 
-       for (i = 0; i < state->num_private_objs; i++)
-               if (obj == state->private_objs[i].ptr)
-                       return state->private_objs[i].state;
+       obj_state = drm_atomic_get_new_private_obj_state(state, obj);
+       if (obj_state)
+               return obj_state;
 
        ret = drm_modeset_lock(&obj->lock, state->acquire_ctx);
        if (ret)