From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4DCAC43458 for ; Wed, 8 Jul 2026 16:08:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B98D10F1B0; Wed, 8 Jul 2026 16:08:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="c0SW3IKI"; dkim-atps=neutral Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2247F10F1B5 for ; Wed, 8 Jul 2026 16:08:56 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 097B743E22; Wed, 8 Jul 2026 16:08:56 +0000 (UTC) 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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) drm_dev_put(dev); } EXPORT_SYMBOL(__drm_atomic_commit_free); +static int drm_atomic_commit_set_crtc_state(struct drm_atomic_commit *commit, + struct drm_crtc *crtc, + struct drm_crtc_state *crtc_state) +{ + int index = drm_crtc_index(crtc); + + drm_modeset_lock_assert_held(&crtc->mutex); + + commit->crtcs[index].state_to_destroy = crtc_state; + commit->crtcs[index].old_state = crtc->state; + commit->crtcs[index].new_state = crtc_state; + commit->crtcs[index].ptr = crtc; + crtc_state->state = 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 = drm_crtc_index(crtc); + int ret; struct drm_crtc_state *crtc_state; WARN_ON(!state->acquire_ctx); drm_WARN_ON(state->dev, state->checked); @@ -461,15 +478,15 @@ drm_atomic_get_crtc_state(struct drm_atomic_commit *state, crtc_state = crtc->funcs->atomic_duplicate_state(crtc); if (!crtc_state) return ERR_PTR(-ENOMEM); - state->crtcs[index].state_to_destroy = crtc_state; - state->crtcs[index].old_state = crtc->state; - state->crtcs[index].new_state = crtc_state; - state->crtcs[index].ptr = crtc; - crtc_state->state = state; + ret = drm_atomic_commit_set_crtc_state(state, crtc, crtc_state); + if (ret) { + crtc->funcs->atomic_destroy_state(crtc, crtc_state); + return ERR_PTR(ret); + } drm_dbg_atomic(state->dev, "Added [CRTC:%d:%s] %p state to %p\n", crtc->base.id, crtc->name, crtc_state, state); return crtc_state; -- 2.54.0