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 E04C3442FDB for ; Wed, 12 Aug 2026 12:57:13 +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=1786539437; cv=none; b=h/Lh8UluKTm+Ez7pPARbTXnkd3ZcD9INu4YYb2HDZtE9FJqbASkRlyWa1A1m0Neuxgy52EX2PN9IgI9lwVDQUdKaEdPP2PGDFHz92A0lMdoPzTPSNZCNMjgwp2J7qqQEOU8HjzfTENK+ArvBeSuEjDloas7rbOxFULisMiAcovY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786539437; c=relaxed/simple; bh=mvC8R3he83Sx8Bn/GijgiPNEqIKrsSdGEmvIcsmc3Z8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DmhTLwd5+uxLOFnXFXU+AsWYAuPJKf3afOrVPtVRdCr114F/mBRVwxcdiWvBOWvL9KrLqbST3jWEcQ3H+5paYnwUu0RfpbArW9BLVpEq+6jYsm13yBVDJY0q4KX0gMwtOQu7/gjqqI8GdPzXaYvahBVYLzYITQBTaF5ZSRjt1do= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YPqAbyrX; 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="YPqAbyrX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D40C1F00A3E; Wed, 12 Aug 2026 12:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786539430; bh=o+wRKcqtX8Gem5V41aHQY1Antv1/5gUeTHY9nwMxhfs=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=YPqAbyrXBrn2yc8GkgjP+m7wMG5sqUx7mt1hnMmIlMKFpLVZN9tnI8DE+BwVd5Kwl KAqggiRcxlW+6k6NZWhyfPBSNdTKj4A79vXoD3zm9H9SjoqayQlXv0n77FO3lA8CrH +X1Rfcc3HDRPH0UATztQKxrR4RO+U1PAsiSv79eM0G4dO0InU6K7Fea6TdGn8IsZmz 0PvSLuuIX77W5rUapi32QVlikLWMR9226fKfgoChI0e3HqPrey/GnoEpctA/xth4LH srO7RTV62gyBBPgET/iY5fidN0DbgNYT6B5n9q/3uUiDB9B4Ys4qppAkDq849wJAl9 FQeODHkoClYfg== From: Maxime Ripard Date: Wed, 12 Aug 2026 14:56:57 +0200 Subject: [PATCH RFC v2 2/9] 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: 7bit Message-Id: <20260812-drm-reset-state-flag-v2-2-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=2732; i=mripard@kernel.org; h=from:subject:message-id; bh=mvC8R3he83Sx8Bn/GijgiPNEqIKrsSdGEmvIcsmc3Z8=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFk1ubMnt+xy//zxhd2Xef774nhEOXT/XQ0Pm7DHdwHX5 rPWm99t75jKwiDMySArpsjyRCbs9PL2xVUO9it/wMxhZQIZwsDFKQATOf6GsZr109W0DTu/hfQ8 VrSU/+e7NE/F/leH4a1pt588iNJ2ywq7mVYiMyeXu/9kxqqWVokmP8Y621sx59piHEXOyr8oqz1 1+8N+kS1xO9Lsshic5zGxqkT1TZWQaEk1Xv6zymDO3Gl/G88AAA== 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 7aeeeb2fe472..91219c382d14 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.55.0