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 E874041E6B6 for ; Fri, 16 Oct 2026 07:32:25 +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=1792135947; cv=none; b=a8jhvuILGyRWD1+GfzqW8fzvszI+ibjTrK4sGTGfe5x7iadiWa0tWzzKeGuaGteTjfWZojIC+fy8OwWrjIQRhKOMrVVoCg/QUx04xy9EaNwJiiAg3jerIgGOL4LGQ1yEFwQSnfep/erTvyOK/WQjZi5MBQ+tpxh8DdvokSH9w/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792135947; c=relaxed/simple; bh=1wiVliL0xqxSktWJmPZm/odmf5wb35Kj9QlH1jOLiu0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BD9f/6RMDnLYopp3cLN/nveWoCtiQMaYQp7PbmceKMAtx8r21c7wIHxfBLbcZcZse5IhaBYizS5Y8oxnS8J1thATGa2xG08UMtb9a/wTw/xdQWjD4WPmfDEWeTXqBv0eu9qvH9Htu1CdeXZ0AFXgc2vvTGwtAdKQqK6e40dM30E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LcU7z/F3; 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="LcU7z/F3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8D9F1F000C4; Fri, 16 Oct 2026 07:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792135945; bh=7BW84V2ROisULkBTaVZHKSFcq1ej0GE9zWxoBRb6B9w=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=LcU7z/F3dVEFw9dYwM8pRMVK5GoCcTdbd/Dz4I8shGmDjHSTMJn/bBz9fqOiqeeLg n5p1xuCkA9QiybSnhHl056I3mH4647YoAA9kUSwqYJYVLZLZ9reTFDKiUjSSu06JDu OJiryVCtS/8DmSLUybe+uhlMnpFamvxzFO1flUbNHE6gBbEMNNXLHiDAQSaJyEXo8X VPkUFfQpuJYyAF4pyUjL2YCm/zAy7WT5ADkI1XFYWjYZOCXzXHlZ6qmADEbDuT8nLA U7PaUaNcHVUiuUcrabIFC75SlxvtOdyKRCDbDXigsLIXo84jWZmeAT3FqsEPFVhbI8 lPtRRrAFaFNIw== From: Maxime Ripard Date: Fri, 16 Oct 2026 09:31:39 +0200 Subject: [PATCH v5 07/14] 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: <20261016-drm-reset-state-flag-v5-7-dad2d64b693b@kernel.org> References: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@kernel.org> In-Reply-To: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Louis Chauvet , Haneen Mohammed , Melissa Wen 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=3836; i=mripard@kernel.org; h=from:subject:message-id; bh=1wiVliL0xqxSktWJmPZm/odmf5wb35Kj9QlH1jOLiu0=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFkXLz3epPWh/trSowUvf71Rj+i3q3u5p1NCtPyDiWOju E2xYs/TjqksDMKcDLJiiixPZMJOL29fXOVgv/IHzBxWJpAhDFycAjCRiTmMDesbREys/Kc9rjv6 hoMpRdOfQ/Lxo0POW7h/SopxVKh/mM1YmNVokfLt+P+/licenLgZxFhfU8787r7Gj3h+uxuBK2V Mf+13kTO/VbL5rc2ksy+vTXt98ULHj9Q9rctdV7/L8+Po/3AUAA== 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. Reviewed-by: Daniel Stone Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 53 +++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 807b575ecc54..513e91ad2fdc 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1093,10 +1093,39 @@ 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; + + drm_modeset_lock_assert_held(&obj->lock); + + num_objs = commit->num_private_objs + 1; + arr = krealloc_array(commit->private_objs, num_objs, + sizeof(*commit->private_objs), GFP_KERNEL | __GFP_ZERO); + if (!arr) + return -ENOMEM; + + commit->private_objs = arr; + index = commit->num_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 * @@ -1109,12 +1138,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; - 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); @@ -1124,30 +1152,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; - arr = krealloc_array(state->private_objs, num_objs, - sizeof(*state->private_objs), GFP_KERNEL | __GFP_ZERO); - if (!arr) - return ERR_PTR(-ENOMEM); - - state->private_objs = arr; - index = state->num_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