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 C0B0A4432F2 for ; Wed, 12 Aug 2026 12:57:16 +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=1786539445; cv=none; b=a11PQRh40P58wgpRDpT7+/hVFW75SXLBoJbt412iVEvDBym3qSfuENv6lY9BB4VD7fq+43gaCXcvc7p1nMsWlgaZYlFld5SnzIQ1IM6xWeoKEEr9WqN0RiBFMQKgsPKF8nc6xFRdPA/RJI7jCOYCf4IB6EJv/sIlKmnoKBagEHg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786539445; c=relaxed/simple; bh=v7jESdL4cHOWjb/Oz/3ZTHuGWO1WGBzHffGrF2n3Bi0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X4A45J3b9ZldQUNfQv1jWM+x1rPsmuEPhTpV0+zp9hjAMeOMNj/GI+rx42mUWyG+xdvwQyXZksXeRzR95dOqOgNcsgktIC5SNYDCyty6X0acbak+Bz/9fGpbxha/Vcj4JZTgzV6Rues1nRCjQALmzpj5amL6/nf4x74NUsk4MBs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nbqcEObF; 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="nbqcEObF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E885B1F000E9; Wed, 12 Aug 2026 12:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786539432; bh=6DKdJj5MKpM3O0y8X5AkvQk6AWDM1oJJkPw2hvfmZUU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=nbqcEObFKKHSMqErcO0BKj8aN0Nax6lKBcjUilQlN+3jRD0xAlJGXDhvLuQrkxUY0 Rr/upbaVW1tDqIUSNH3/4BMu/PkGblqExzBmsjyQq1DnJHBN0gS6jSQR8TkYCNmJs3 DO7oKJxu/to2HuPYGDpRFYTIr2jWTtuZb5sHk7a1mNOn9lCQjrZO5H0fEXV8vvtHCQ bGW4lBBqxzzo634Ur7JZ6ewKnChGrMyACqR0bZII7cqymKIxdmDCPgTWqtQ8KKOvQh kA2B6W6lokuA/zALJpPr6KAHYNLnf8kmxmoFJIlcdUwekycgl8pWJgd3mP83dLwJrC sXWDTpN6Vkg3w== From: Maxime Ripard Date: Wed, 12 Aug 2026 14:56:58 +0200 Subject: [PATCH RFC v2 3/9] drm/atomic: Create function to insert plane 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-3-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=2806; i=mripard@kernel.org; h=from:subject:message-id; bh=v7jESdL4cHOWjb/Oz/3ZTHuGWO1WGBzHffGrF2n3Bi0=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFk1ubPPvLheEf5lsfL5JTJv6rcvPu1S/GSTa5X0uy+8d r+9noVf7JjKwiDMySArpsjyRCbs9PL2xVUO9it/wMxhZQIZwsDFKQAT4TRnrC/oVj94UnvtTOb+ 210/FLgVAss5972dqLusLe8+ZxvnppOVoiEzzPbeXnbG/86nl6p1TYwNB2q8Vx1c+OlDl0wU91T rlq8HL9/WPSpYx7e84qPe9pt1P/0+vfkTJbk+MFXSY3L5FiNFAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_get_plane_state() allocates a new plane 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 plane state into a commit without going through the full allocation and duplication path in drm_atomic_get_plane_state(). Extract the state insertion logic into a new static drm_atomic_commit_set_plane_state() helper, and convert drm_atomic_get_plane_state() to use it. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 91219c382d14..2ac26ed64823 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -624,10 +624,27 @@ static int drm_atomic_connector_check(struct drm_connector *connector, } return 0; } +static int drm_atomic_commit_set_plane_state(struct drm_atomic_commit *commit, + struct drm_plane *plane, + struct drm_plane_state *plane_state) +{ + int index = drm_plane_index(plane); + + drm_modeset_lock_assert_held(&plane->mutex); + + commit->planes[index].state_to_destroy = plane_state; + commit->planes[index].old_state = plane->state; + commit->planes[index].new_state = plane_state; + commit->planes[index].ptr = plane; + plane_state->state = commit; + + return 0; +} + /** * drm_atomic_get_plane_state - get plane state * @state: global atomic state object * @plane: plane to get state object for * @@ -642,11 +659,11 @@ static int drm_atomic_connector_check(struct drm_connector *connector, */ struct drm_plane_state * drm_atomic_get_plane_state(struct drm_atomic_commit *state, struct drm_plane *plane) { - int ret, index = drm_plane_index(plane); + int ret; struct drm_plane_state *plane_state; WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); @@ -665,15 +682,15 @@ drm_atomic_get_plane_state(struct drm_atomic_commit *state, plane_state = plane->funcs->atomic_duplicate_state(plane); if (!plane_state) return ERR_PTR(-ENOMEM); - state->planes[index].state_to_destroy = plane_state; - state->planes[index].ptr = plane; - state->planes[index].old_state = plane->state; - state->planes[index].new_state = plane_state; - plane_state->state = state; + ret = drm_atomic_commit_set_plane_state(state, plane, plane_state); + if (ret) { + plane->funcs->atomic_destroy_state(plane, plane_state); + return ERR_PTR(ret); + } drm_dbg_atomic(plane->dev, "Added [PLANE:%d:%s] %p state to %p\n", plane->base.id, plane->name, plane_state, state); if (plane_state->crtc) { -- 2.55.0