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 82C204FC352 for ; Fri, 18 Sep 2026 14:18:28 +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=1789741109; cv=none; b=B9MlXfANRok0t6Hze8N89rrQg4BNu40vhbXsQ/xbShKIW6ccHQrDZPB+g0FyajQNNnCrNjRhIME0Jz48b9hDpLo0vdhz56tTAYRw3fQd2xBlgaB6e6CghtzgbPVqxXNsnba1GZIDrqVZErOLnQfmc9O5Y8dcTdutEHETB9CztVk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789741109; c=relaxed/simple; bh=BRJTGw+97onV97kbziQAIAbVIFdl8pBQs6TCy6DnSP8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iJO4WLE6QIxGD2dV+QtvlFuY1G4dL2XjEgQzkDbyAdf8+TPRLQ3bh3h80R14NJ+ZjrI3dtVjVaZKkcSx1JEYWyVvFHFwUcUxwK82lePMm2hPryR8uZ8N49dkfRvNjBxculrir1OWDcyCOh/7NNw1ZTfoGCOPZ4Wa0ytqZ2udEhE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B1hHrrcP; 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="B1hHrrcP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2B2A1F00898; Fri, 18 Sep 2026 14:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789741108; bh=0WzE1B1LSthpsJjNPaw9LSFgpt2AeBHiUQMGOCcRaIg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=B1hHrrcP0j7SijW2Ss3v7PFTA0g5g53uklPshgUNzusDbeIIB+lLwBbNIk/di2/Ug Wmmfyvbj+HfW+lzHNFR19aBSZI902WfG09smN8W64grCCnbAxF/Fe29wZ92vSbcgHj Qf6dJHKQphhoqMFO0iSXM9nSvbx7sEi4lJ7GD+o+a9vhIIusi+fl6fTh+lgA7/3lo7 sW4uLxPcG7gYbniBfA9Ku5EoNa1CCV2LZmyvwLjyPLoN2OggRd6IijEh6tVB4GLngS 8EoXNM6UdPRLLb6of8hXMUm2bvu7VUhYG/jTgff5+LbyrtRIb/5dCzDw2dzMHggjGb q6couLbjfnA8A== From: Maxime Ripard Date: Fri, 18 Sep 2026 16:17:56 +0200 Subject: [PATCH v4 07/13] 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: <20260918-drm-reset-state-flag-v4-7-5ad106370f05@kernel.org> References: <20260918-drm-reset-state-flag-v4-0-5ad106370f05@kernel.org> In-Reply-To: <20260918-drm-reset-state-flag-v4-0-5ad106370f05@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=3785; i=mripard@kernel.org; h=from:subject:message-id; bh=BRJTGw+97onV97kbziQAIAbVIFdl8pBQs6TCy6DnSP8=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFlrPYSehL+7MVv/0zrT+ZvLzrGsWfP2wIm/SUsD7z6O/ blW+w9rV8dUFgZhTgZZMUWWJzJhp5e3L65ysF/5A2YOKxPIEAYuTgGYCPsvxnr/uzuYq0L4fhzk jF+5//T5rc5255+cDKhb08fOljKlKEMxcaG85a774Y80pf0caqOj9BgbDjq4iVwPaTJw/nF+XVT KvCtxa92ONC5xPCrWYmQQ/bXQeMcl7Rvs/ua+s2dbba3kfRcGAA== 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 | 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