From nobody Wed Aug 26 10:41:10 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 E8F73409266 for ; Wed, 8 Jul 2026 16:08:56 +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=1783526939; cv=none; b=uFzcMMU/WDPfx7ENREmI3bm326tU4+MjpKLNbrIRuOyDcu+Lm40Ydw3oqAsx+obnYoAHspOq9/pdhPTXaofl61kFq5sccKKS72/knZF4uPsW6N5j547PzqAnW4UHWstaJZq5MQDJeD0vaFnRPqmRGYqfUWi3yjOjea3f0/LKWwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783526939; c=relaxed/simple; bh=wOVtouWGdtNmWGRK3f216LfqS94uyTD5akEfZ5+fI2E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K26z1zPsgWyhHF/e9jhlOMswWk/5AvxMp3hYf56fNOllmdF37EeYp+onbtsITJBDxfi+4Fru9OcAl1TT4NioPUY+npZyojZXtY8oIJ9B9DfdxXVo9r0Io4pNtERXLkcs9W2NrVJOWUUAjT2D+C5iJANkm5wUSKnyAiiub3cvUdU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c0SW3IKI; 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="c0SW3IKI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68C101F00A3A; Wed, 8 Jul 2026 16:08:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783526935; bh=E9Sam0F4kzLWsvElF0u6Eym/SDV5PThJcikxmfCmf6I=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=c0SW3IKIGPT4FdQb7gKYt8ACj6t1bvj3i812dH2JZMAxSjBBR00bjSlMheT4KtKk9 PDmRCGkH25FtjhelzEZ6oM+NJQzVng+ig6s4LaAxUjLhg8CwTl/heIfI6G0n5Bo3b3 gWuXwgJmgb2r4faTmULdvB1YBb6LX3ZWfUP8lt1K5z27n48Pn1IhyOjBpDrbSAcNht foEiiEHsas5OoJ8IuBkmRGiLw6gSJxxVxb7kHj1CixAshi5slVGTHquaQ8MnpnkZXr PCXQoO3NGGJxBJ9vVek0x4VQk0dRDGedh4HBtQWc3r1Kn6cbGQeF7E6RKDmO5sZIcH lM490lRTgyScA== From: Maxime Ripard Date: Wed, 08 Jul 2026 18:08:39 +0200 Subject: [PATCH RFC 2/8] drm/atomic: Create function to insert CRTC 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-2-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=2732; i=mripard@kernel.org; h=from:subject:message-id; bh=wOVtouWGdtNmWGRK3f216LfqS94uyTD5akEfZ5+fI2E=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFl+Zbz88eVf/BwdWBp2T263jP3wVZrr7NL29ABXJ6YFz 7Skzj7rmMrCIMzJICumyPJEJuz08vbFVQ72K3/AzGFlAhnCwMUpABPRPMdYp/NyW45Z45bb19ev 0pvk8WJ3errT6ceqr4yms8zsNGY8JNEqKO3CGct0xdt+wcn3N0NfMlYx+/hfCbkY8KpsefzHxtu i254+8p779LdPpnOTyf+0Y6o/4pyvbEgw6np1/iDPgpfzPx4AAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_get_crtc_state() allocates a new CRTC 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 CRTC state into a commit without going through the full allocation and duplication path in drm_atomic_get_crtc_state(). Extract the state insertion logic into a new static drm_atomic_commit_set_crtc_state() helper, and convert drm_atomic_get_crtc_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 4bc6bdfb6f1f..4ffe5147ab16 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -421,10 +421,27 @@ void __drm_atomic_commit_free(struct kref *ref) =20 drm_dev_put(dev); } EXPORT_SYMBOL(__drm_atomic_commit_free); =20 +static int drm_atomic_commit_set_crtc_state(struct drm_atomic_commit *comm= it, + struct drm_crtc *crtc, + struct drm_crtc_state *crtc_state) +{ + int index =3D drm_crtc_index(crtc); + + drm_modeset_lock_assert_held(&crtc->mutex); + + commit->crtcs[index].state_to_destroy =3D crtc_state; + commit->crtcs[index].old_state =3D crtc->state; + commit->crtcs[index].new_state =3D crtc_state; + commit->crtcs[index].ptr =3D crtc; + crtc_state->state =3D commit; + + return 0; +} + /** * drm_atomic_get_crtc_state - get CRTC state * @state: global atomic state object * @crtc: CRTC to get state object for * @@ -443,11 +460,11 @@ EXPORT_SYMBOL(__drm_atomic_commit_free); */ struct drm_crtc_state * drm_atomic_get_crtc_state(struct drm_atomic_commit *state, struct drm_crtc *crtc) { - int ret, index =3D drm_crtc_index(crtc); + int ret; struct drm_crtc_state *crtc_state; =20 WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); =20 @@ -461,15 +478,15 @@ drm_atomic_get_crtc_state(struct drm_atomic_commit *s= tate, =20 crtc_state =3D crtc->funcs->atomic_duplicate_state(crtc); if (!crtc_state) return ERR_PTR(-ENOMEM); =20 - state->crtcs[index].state_to_destroy =3D crtc_state; - state->crtcs[index].old_state =3D crtc->state; - state->crtcs[index].new_state =3D crtc_state; - state->crtcs[index].ptr =3D crtc; - crtc_state->state =3D state; + ret =3D drm_atomic_commit_set_crtc_state(state, crtc, crtc_state); + if (ret) { + crtc->funcs->atomic_destroy_state(crtc, crtc_state); + return ERR_PTR(ret); + } =20 drm_dbg_atomic(state->dev, "Added [CRTC:%d:%s] %p state to %p\n", crtc->base.id, crtc->name, crtc_state, state); =20 return crtc_state; --=20 2.54.0