From mboxrd@z Thu Jan 1 00:00:00 1970 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 0DB3D442369 for ; Wed, 12 Aug 2026 12:57:17 +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=1786539443; cv=none; b=bELtB2rOKxMggG/1u04OdK9BzhFySvd+q9J+qE6aYp28RRU/F3C6AfxUP8Fm0eQYwbtkOEUMelNd3TwsiL7RCWXqu9jBXKlxpJRf+Yon08spvZLuZYtXx/E6m+oK58ie6c6W4uo3qS4y+O+gOyGKHlIR2sM1TApEigvmE7K8wbM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786539443; c=relaxed/simple; bh=1M1iZwYCM42B/5b+TEDoheVwzzS2oI2EWd1KimgYkYA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P3yzQ5mTBLCPlL4+5pu6PTGkn+yMZvXToIpO01ArdqIsOKFxwikmrchp2XGkZp806vJcEySBe6+4MhoBhrONC4joFWmOTDYZblU0blktEF73+hzBASMiHsZkit4C1wDcOEX6mta52atC8uGHyM22PuhOaHtD+Isgdfw6QPhcPCc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YNLv8G1i; 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="YNLv8G1i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7B1E1F00A3D; Wed, 12 Aug 2026 12:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786539437; bh=HIvQR5MYq6m+q3HuqpSbKPtZo6ZGXtxQjlf0GdUe7JU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=YNLv8G1ivBNOFb7+XKAsTdxWaFsSkvpixrAWrPQtWtTraV1vCbqYhPP9uhCDhdr94 IzuVxlDigxme9wM+2qEEef7yvWyM4PHuNhGOc8lB4nR2rtBzNPhM2YHInSA1/IfE+c 1VLb12tSFZZZ2OSnP8hioRJ4P0Io5BYdQaCh5A8drq8eKWeKkoxBoqhBUWLZQ9TduK YSFuh+fMk87ZjGVEa9JjMRl/wFxS7dsn4Gx45V+y3F2vEQgcZEU8peOtoRpOYKP8RQ C239NHKKqcEwyg2Wofjq/lyUOqq5yMbIGdez0atB9s+7jxwogpe1pDRSt3Zf76iPJP 6BWHCPsxIw/Kg== From: Maxime Ripard Date: Wed, 12 Aug 2026 14:57:00 +0200 Subject: [PATCH RFC v2 5/9] 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: 7bit Message-Id: <20260812-drm-reset-state-flag-v2-5-e96ce13317dd@kernel.org> References: <20260812-drm-reset-state-flag-v2-0-e96ce13317dd@kernel.org> In-Reply-To: <20260812-drm-reset-state-flag-v2-0-e96ce13317dd@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Daniel Stone , Harry Wentland , Jocelyn Falempe , =?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=1M1iZwYCM42B/5b+TEDoheVwzzS2oI2EWd1KimgYkYA=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFk1uXOqZwq03pB4//bHKaPXV9/k/Gt4n3PRqpy5P+O9x Ve/GxEOHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAiPXMZq1kZO7jVGJ4e/6Ke 8MDw+e4PhQ57zxS9i2bkvvbhrbCLtQDr898Gq+1OCRVu6S4uzS47xNjw76Le74jPBvt/tIsGdE8 zZnK8t5WBR2bB5yBt4WlBLBaJr9U+iFrmG8zoenHm3L6yE8cB 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 e89e1d18c783..88cdb65698c9 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); +static int drm_atomic_commit_set_private_obj_state(struct drm_atomic_commit *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 = commit->num_private_objs + 1; + size = sizeof(*commit->private_objs) * num_objs; + arr = krealloc(commit->private_objs, size, GFP_KERNEL); + if (!arr) + return -ENOMEM; + + commit->private_objs = arr; + index = commit->num_private_objs; + memset(&commit->private_objs[index], 0, sizeof(*commit->private_objs)); + + commit->private_objs[index].state_to_destroy = obj_state; + commit->private_objs[index].old_state = obj->state; + commit->private_objs[index].new_state = obj_state; + commit->private_objs[index].ptr = obj; + obj_state->state = commit; + + commit->num_private_objs = 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; WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); @@ -1129,31 +1158,19 @@ drm_atomic_get_private_obj_state(struct drm_atomic_commit *state, ret = drm_modeset_lock(&obj->lock, state->acquire_ctx); if (ret) return ERR_PTR(ret); - num_objs = state->num_private_objs + 1; - size = sizeof(*state->private_objs) * num_objs; - arr = krealloc(state->private_objs, size, GFP_KERNEL); - if (!arr) - return ERR_PTR(-ENOMEM); - - state->private_objs = arr; - index = state->num_private_objs; - memset(&state->private_objs[index], 0, sizeof(*state->private_objs)); - obj_state = obj->funcs->atomic_duplicate_state(obj); if (!obj_state) return ERR_PTR(-ENOMEM); - 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; - obj_state->state = state; - - state->num_private_objs = num_objs; + ret = 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); + } drm_dbg_atomic(state->dev, "Added new private object %p state %p to %p\n", obj, obj_state, state); -- 2.55.0