From nobody Thu Aug 27 06:17:57 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 A941741CB55 for ; Wed, 8 Jul 2026 16:08:58 +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=1783526940; cv=none; b=VjeXs5fT1ONm24p7ZP85zbTlD0BPVNGSdNtaa1huet+cKuOMVv2wxbDhnI7JVoiti9YokHD/BGG8iWUIHNhqKFj1CuAPuD4Jnpl/s2iVxuo8au926mVcAsNq4yIFex5VjLwnjnsrK/YPGspOdwR5jLR8QsFu7EIsXahyGKcTLhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783526940; c=relaxed/simple; bh=+m3EkhPCSKnDM62Sj8VCyS0IMXT5OeoiJOPJ7/JI43k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YRrx+UelXPIFHHJrkWF9m7fLz1/gmY8osrZoHF9ij4smXH6ahGRKXgg4iSmkDjUD6wpcFg55dS4Z1XYtCqMvKDWjDFWyNxRDAkZ2B0xgvbKBLBRI9BwFP7pVUUpa0ID/BuaNBoU3qypOzMhWJCT/JE3oJ1plUbOwlpWFbWCwIh0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aICbbck2; 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="aICbbck2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0A251F000E9; Wed, 8 Jul 2026 16:08:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783526938; bh=gKSeSbYXgSfM92sgbcX2oAZv75cRfJIEeGO45LS1JR4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=aICbbck2G1ogn4pOF0EQLv0ASmJTLd3TQEwWdDD/zf3LKbjwoKYhEcNmgeNE0zGFg 77AowNjgTCYW/lu/lFnmrhTDMBw+SUeRq8Ja+T03VA2aN4r7cpkPOVZPjnCxGdExBd AsIGUzwGNWtjBlzLFXtpJ0k4gIUnK5TPyInNFflk54XCk61u7E1sH+/ReUHU7m4F9h iK60u80ccIADb1CYMjiHY11uLKXGZ4XYaI+q5IHvA8PI3Y2C+A0p7/jNI0amO4Isgo Eg7W2WD0Ndc2fjA9bdLwyaPep5chjPmOSP4g9qIVuvsnWTkJ6wi9Iz/fAX9ILhYwi7 W/E6yMmzBMqEA== From: Maxime Ripard Date: Wed, 08 Jul 2026 18:08:40 +0200 Subject: [PATCH RFC 3/8] 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: quoted-printable Message-Id: <20260708-drm-reset-state-flag-v1-3-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=2806; i=mripard@kernel.org; h=from:subject:message-id; bh=+m3EkhPCSKnDM62Sj8VCyS0IMXT5OeoiJOPJ7/JI43k=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFl+ZXyiq4z59y8u3Pbe5H9PyfXvU7Yp/L/+5Qan4+aMo +F3rv5Z1TGVhUGYk0FWTJHliUzY6eXti6sc7Ff+gJnDygQyhIGLUwAmsqGMseHYtfqJ97v7ciue b1h7VFTxQtakadf6q/bqHjt66ZnenX/X1Vpulq5mKtW4funo6r7T7i8YG1Y7mHM1ZjbIbi/yDKm 9XvfjbfZZ2Wz21odyE3r2TP115oCpxf5L0rfYTZISjAyPNd6WBgA= 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 4ffe5147ab16..56542494ab56 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_conn= ector *connector, } =20 return 0; } =20 +static int drm_atomic_commit_set_plane_state(struct drm_atomic_commit *com= mit, + struct drm_plane *plane, + struct drm_plane_state *plane_state) +{ + int index =3D drm_plane_index(plane); + + drm_modeset_lock_assert_held(&plane->mutex); + + commit->planes[index].state_to_destroy =3D plane_state; + commit->planes[index].old_state =3D plane->state; + commit->planes[index].new_state =3D plane_state; + commit->planes[index].ptr =3D plane; + plane_state->state =3D 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_conn= ector *connector, */ struct drm_plane_state * drm_atomic_get_plane_state(struct drm_atomic_commit *state, struct drm_plane *plane) { - int ret, index =3D drm_plane_index(plane); + int ret; struct drm_plane_state *plane_state; =20 WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); =20 @@ -665,15 +682,15 @@ drm_atomic_get_plane_state(struct drm_atomic_commit *= state, =20 plane_state =3D plane->funcs->atomic_duplicate_state(plane); if (!plane_state) return ERR_PTR(-ENOMEM); =20 - state->planes[index].state_to_destroy =3D plane_state; - state->planes[index].ptr =3D plane; - state->planes[index].old_state =3D plane->state; - state->planes[index].new_state =3D plane_state; - plane_state->state =3D state; + ret =3D drm_atomic_commit_set_plane_state(state, plane, plane_state); + if (ret) { + plane->funcs->atomic_destroy_state(plane, plane_state); + return ERR_PTR(ret); + } =20 drm_dbg_atomic(plane->dev, "Added [PLANE:%d:%s] %p state to %p\n", plane->base.id, plane->name, plane_state, state); =20 if (plane_state->crtc) { --=20 2.54.0