From nobody Tue Aug 25 23:49:28 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 00C65409286 for ; Wed, 8 Jul 2026 16:09:00 +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=1783526942; cv=none; b=g6p4GIfT8MGOA+Q0zFgUCckQjj/TM2fR9TYkqMefjKov61VfqyYM9jdmAjNCgDPJL8B2RM1h31OSJ6xQIrCSs7OMl1pb1IXw2pRXiHOeUzIU6CrJN4/dgdacBz7c6TN9YFKOxgSdZh8PK9LuzeO5iDUkmMp6TIr8eV0OiwTxjE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783526942; c=relaxed/simple; bh=fttxGMVBGL07n7oY5tNcqwsyIoOf7c4O1B/Bmytm3Sg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZuJ0u/AMnx7dtVbjViPSt0jaRsKiowlzAsiuBmak+w2rm7K6ySI8qK2BnmIwhjeoFnAMmeafUzbAvtfYkNMB4c0ERn7fqH911+1HLiyD+CHVdCKJWr8diOygOSG3kkGof7sT+LNK5+0crG+zFMBgpPy/5QqnrAt8yTzofxKHRtQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ypuuk+gP; 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="Ypuuk+gP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 249B11F000E9; Wed, 8 Jul 2026 16:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783526940; bh=JkCB/yLDgCMXGjeHTwMFtk2LLys1f8LzwWd7x1TS8IE=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Ypuuk+gPb5o8Sv70XfHcdhwffvMYRZMDCKVDLKTizFl0H5Czb6KaM9pqg8seJitys iJervuAtVAMQ7rshCWjMVvuhAv/VNsTfrK2TUgexa7d7NI7OUjG6OQRaMp/mcWSHNH c2oi1gMLQho/TJIK4/t8jZIv5z0Ut6El4934uE0DKWt83Hc1Pg9xzuOJptPEr7ZV+0 UsIl0QOXEkwRXhxMnbPn4Ha9Ga6InTS5Q9Tk5T4cLMZd8JVwlV/xHpgHm/pTSwQNzL +Ni74rwd01+omNfh0TBlJfwvaJ6nPi8Nk5jLlkywKMbGxnYilRjxH93eoBgGhRNL7z d07YPrYWaoW5A== From: Maxime Ripard Date: Wed, 08 Jul 2026 18:08:41 +0200 Subject: [PATCH RFC 4/8] drm/atomic: Create function to insert colorop 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-4-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=2961; i=mripard@kernel.org; h=from:subject:message-id; bh=fttxGMVBGL07n7oY5tNcqwsyIoOf7c4O1B/Bmytm3Sg=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFl+ZXwxSxpniaRMvMHVXzVrmqVu2ENV8cQj+2zkw1iKR KJ/BE3tmMrCIMzJICumyPJEJuz08vbFVQ72K3/AzGFlAhnCwMUpABN59pmx4ay8RJbTgv1865Ln 3c9x62FcNUM4bFVlxpWAuXvC6gKOR/bvy1VaUPph9hvdmF2LvUsSGOuzyt40dFoUaf3nvN9W9PJ TxZbXLgEL2U5OZ0pd+1qnqM9YWc/NWopxnjNHmNHy9dsZ4gE= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_atomic_get_colorop_state() allocates a new colorop 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 colorop state into a commit without going through the full allocation and duplication path in drm_atomic_get_colorop_state(). Extract the state insertion logic into a new static drm_atomic_commit_set_colorop_state() helper, and convert drm_atomic_get_colorop_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 56542494ab56..f006de9b7263 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -704,10 +704,27 @@ drm_atomic_get_plane_state(struct drm_atomic_commit *= state, =20 return plane_state; } EXPORT_SYMBOL(drm_atomic_get_plane_state); =20 +static int drm_atomic_commit_set_colorop_state(struct drm_atomic_commit *c= ommit, + struct drm_colorop *colorop, + struct drm_colorop_state *colorop_state) +{ + int index =3D drm_colorop_index(colorop); + + drm_modeset_lock_assert_held(&colorop->plane->mutex); + + commit->colorops[index].state_to_destroy =3D colorop_state; + commit->colorops[index].old_state =3D colorop->state; + commit->colorops[index].new_state =3D colorop_state; + commit->colorops[index].ptr =3D colorop; + colorop_state->state =3D commit; + + return 0; +} + /** * drm_atomic_get_colorop_state - get colorop state * @state: global atomic state object * @colorop: colorop to get state object for * @@ -723,11 +740,11 @@ EXPORT_SYMBOL(drm_atomic_get_plane_state); */ struct drm_colorop_state * drm_atomic_get_colorop_state(struct drm_atomic_commit *state, struct drm_colorop *colorop) { - int ret, index =3D drm_colorop_index(colorop); + int ret; struct drm_colorop_state *colorop_state; =20 WARN_ON(!state->acquire_ctx); =20 colorop_state =3D drm_atomic_get_new_colorop_state(state, colorop); @@ -740,15 +757,15 @@ drm_atomic_get_colorop_state(struct drm_atomic_commit= *state, =20 colorop_state =3D drm_atomic_helper_colorop_duplicate_state(colorop); if (!colorop_state) return ERR_PTR(-ENOMEM); =20 - state->colorops[index].state =3D colorop_state; - state->colorops[index].ptr =3D colorop; - state->colorops[index].old_state =3D colorop->state; - state->colorops[index].new_state =3D colorop_state; - colorop_state->state =3D state; + ret =3D drm_atomic_commit_set_colorop_state(state, colorop, colorop_state= ); + if (ret) { + drm_colorop_atomic_destroy_state(colorop, colorop_state); + return ERR_PTR(ret); + } =20 drm_dbg_atomic(colorop->dev, "Added [COLOROP:%d:%d] %p state to %p\n", colorop->base.id, colorop->type, colorop_state, state); =20 return colorop_state; --=20 2.54.0