From nobody Wed Aug 26 00:40:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50CE042DA43 for ; Wed, 8 Jul 2026 16:09:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783526944; cv=none; b=c6dl9DCZkhNayG+SnDH76uC6jGXvSzGk75D9jj3WxBoIZ/VE8wl89EQlulEzy15uJaW0tumkvacsO3guOy4wColvwUj6rVccHl6I3O19/7fGQt0jYRZILeTn0gpXJwU6rKXpKyB2tYsI+4NfNTYDy+AvU4vDjR3mcVFhAN++TVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783526944; c=relaxed/simple; bh=tFHqYNW5dmxUwonpBjXRaJzyfHwYkrZ5+BMI6moJfLo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TALHMq7Sh6ZzS7Kl7tyr9dDv5+raKJwfic4tpfFx5/A2mn47/4lto7f0uLk1E4U4ZuImFdR82HKt29jLHEOnFn+YS9VeiOtMANevJKl5hPH4zhZ0YDIbpH+ZFJTqY7ganYxyMHIBMXabPCrb+SAle/qpN6Zd2KOrk1geyvFrJ+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bYkqo2SJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bYkqo2SJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7BE371F000E9; Wed, 8 Jul 2026 16:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783526943; bh=bJhaJGOcpd7DYv+YzWF0KEhFbZbraRFxmpqaLW2Zs+Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=bYkqo2SJkTlhpj1jdzLRG1pWyO2OPkX8z8qzygof5WyYHNeJLq8CdepI5/Wp7U5cP JODXT8v6LFBghYDbnK7qwne11SiiFZptVmjL11MMWcLAFmzmncPUjFRzlrBBE7aKLa 67OdEAVCxssyiZjD0DLUqgecViw602Hwgkbk63TXkVj8J7+yrrcz2JQF4+jho7mM+Q ATa1kwo7v32ZMRyqoxaYWw82sv7Wil6UJ5V+MXrojLRr0zm//qMoshvH2JEt0O280Q 5HvSv6Wt1zyAlVPvk8676bIA2EApXHJBpMsAt56SrZkLVV6qet3eJOqDamKBSng67J 4wYYLWMO/iuUw== From: Maxime Ripard Date: Wed, 08 Jul 2026 18:08:42 +0200 Subject: [PATCH RFC 5/8] drm/atomic: Create function to insert private obj state into a commit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260708-drm-reset-state-flag-v1-5-c37dc985485d@kernel.org> References: <20260708-drm-reset-state-flag-v1-0-c37dc985485d@kernel.org> In-Reply-To: <20260708-drm-reset-state-flag-v1-0-c37dc985485d@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Daniel Stone , Harry Wentland , =?utf-8?q?Jonas_=C3=85dahl?= , =?utf-8?q?Michel_D=C3=A4nzer?= , Pekka Paalanen , Sebastian Wick , Simon Ser , Victoria Brekenfeld , Xaver Hugl , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3941; i=mripard@kernel.org; h=from:subject:message-id; bh=tFHqYNW5dmxUwonpBjXRaJzyfHwYkrZ5+BMI6moJfLo=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFl+ZfwHj5z8dfbMMtWowNPLLc9suW7B/J6r4NuyqsrFC lZvdKfbdkxlYRDmZJAVU2R5IhN2enn74ioH+5U/YOawMoEMYeDiFICJsK1ibJi7/vRiq9vfuLJM u183vrruMCN9wro/s/1VakR05m+X/MC5K+TNtvT5V6Z8Mzr3KYzlwQbGWvEVqs0ZTk+WLYm5f+1 yhcbPonATX6b+oEN1SzO08/ZvDOztPTTj9IS0XTYiUxykrQ4+AgA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_get_private_obj_state() allocates a new private object state by duplicating the current one and inserts it into the atomic commit as a single operation. However, a later change will need to insert a private object state into a commit without going through the full allocation and duplication path in drm_atomic_get_private_obj_state(). Extract the state insertion logic, including the array reallocation, into a new static drm_atomic_commit_set_private_obj_state() helper, and convert drm_atomic_get_private_obj_state() to use it. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 57 ++++++++++++++++++++++++++++------------= ---- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index f006de9b7263..d4dcab2d851c 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1097,10 +1097,41 @@ drm_atomic_private_obj_fini(struct drm_private_obj = *obj) obj->funcs->atomic_destroy_state(obj, obj->state); drm_modeset_lock_fini(&obj->lock); } EXPORT_SYMBOL(drm_atomic_private_obj_fini); =20 +static int drm_atomic_commit_set_private_obj_state(struct drm_atomic_commi= t *commit, + struct drm_private_obj *obj, + struct drm_private_state *obj_state) +{ + struct __drm_private_objs_state *arr; + int index, num_objs; + size_t size; + + drm_modeset_lock_assert_held(&obj->lock); + + num_objs =3D commit->num_private_objs + 1; + size =3D sizeof(*commit->private_objs) * num_objs; + arr =3D krealloc(commit->private_objs, size, GFP_KERNEL); + if (!arr) + return -ENOMEM; + + commit->private_objs =3D arr; + index =3D commit->num_private_objs; + memset(&commit->private_objs[index], 0, sizeof(*commit->private_objs)); + + commit->private_objs[index].state_to_destroy =3D obj_state; + commit->private_objs[index].old_state =3D obj->state; + commit->private_objs[index].new_state =3D obj_state; + commit->private_objs[index].ptr =3D obj; + obj_state->state =3D commit; + + commit->num_private_objs =3D num_objs; + + return 0; +} + /** * drm_atomic_get_private_obj_state - get private object state * @state: global atomic state * @obj: private object to get the state for * @@ -1113,13 +1144,11 @@ EXPORT_SYMBOL(drm_atomic_private_obj_fini); */ struct drm_private_state * drm_atomic_get_private_obj_state(struct drm_atomic_commit *state, struct drm_private_obj *obj) { - int index, num_objs, ret; - size_t size; - struct __drm_private_objs_state *arr; + int ret; struct drm_private_state *obj_state; =20 WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); =20 @@ -1129,31 +1158,19 @@ drm_atomic_get_private_obj_state(struct drm_atomic_= commit *state, =20 ret =3D drm_modeset_lock(&obj->lock, state->acquire_ctx); if (ret) return ERR_PTR(ret); =20 - num_objs =3D state->num_private_objs + 1; - size =3D sizeof(*state->private_objs) * num_objs; - arr =3D krealloc(state->private_objs, size, GFP_KERNEL); - if (!arr) - return ERR_PTR(-ENOMEM); - - state->private_objs =3D arr; - index =3D state->num_private_objs; - memset(&state->private_objs[index], 0, sizeof(*state->private_objs)); - obj_state =3D obj->funcs->atomic_duplicate_state(obj); if (!obj_state) return ERR_PTR(-ENOMEM); =20 - state->private_objs[index].state_to_destroy =3D obj_state; - state->private_objs[index].old_state =3D obj->state; - state->private_objs[index].new_state =3D obj_state; - state->private_objs[index].ptr =3D obj; - obj_state->state =3D state; - - state->num_private_objs =3D num_objs; + ret =3D drm_atomic_commit_set_private_obj_state(state, obj, obj_state); + if (ret) { + obj->funcs->atomic_destroy_state(obj, obj_state); + return ERR_PTR(ret); + } =20 drm_dbg_atomic(state->dev, "Added new private object %p state %p to %p\n", obj, obj_state, state); =20 --=20 2.54.0