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 9D790CC6B38 for ; Fri, 16 Oct 2026 07:32:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 06284112636; Fri, 16 Oct 2026 07:32:28 +0000 (UTC) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 06FE8112659 for ; Fri, 16 Oct 2026 07:32:22 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id E324E43886; Fri, 16 Oct 2026 07:32:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EAC21F000C4; Fri, 16 Oct 2026 07:32:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792135941; bh=TFxcbguLUVDbJo+3W9hN+xXu1muwi+d7iaXkEhvopfA=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=Q2uo5AqAhUw7P4um/AeAjJL3mijGH12ez1TBECMtypTswIjszAzFKzmqVzRv5+twp FAhzgPdRF8Fh0Himc87jXLM/+US07MmSWcKXem9pQX1SCdRuhj8NuuRSNnEQsIEd1B OgCS9bBGU4SBIfcrlbdLRX1Oehof5RmupO4iLBWI7EiLEhqpphGDFz7dvQIoNq5l39 fv0SUwhO67ofrogSQKb6itjv07NPy30pLgvE9SLoCfrBgI/aWJ10nxlzZztBQtW95/ qh3ZGP7d9GenjmW2QuSzRTOb0pKpHxbnLf7+/Oct58XYvrzt9KlunDOWy+4hbLuPHw LuaNSXBx2elhw== From: Maxime Ripard Date: Fri, 16 Oct 2026 09:31:38 +0200 Subject: [PATCH v5 06/14] drm/atomic: Create function to insert colorop state into a commit MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261016-drm-reset-state-flag-v5-6-dad2d64b693b@kernel.org> References: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@kernel.org> In-Reply-To: <20261016-drm-reset-state-flag-v5-0-dad2d64b693b@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Louis Chauvet , Haneen Mohammed , Melissa Wen 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=2932; i=mripard@kernel.org; h=from:subject:message-id; bh=zNcs7+qm9vBMoxymLjhKYQQ7h6RxRbv20qwl0ST1XsA=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFkXLz2OWh4utGffI5P9H+O/v3+jaaHWlDO5P0OD/wVHl EY6s/vfjqksDMKcDLJiiixPZMJOL29fXOVgv/IHzBxWJpAhDFycAjCRNFvGho0PM/W2WX1ddfWV nc2dWf6cLAr6jgprD6/kO1Of+uLMPEG3qoDb8xY6OAhuMbHPLq9/ytjQ5PbjVTSrHJvJvc+Pfc3 W87aZa0k61BU/W1WpFiS/MDmHY9b+rIXHTs/acUBYumOrQgEA 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_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. Reviewed-by: Thomas Zimmermann Reviewed-by: Daniel Stone Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index b26458ee98d8..807b575ecc54 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -702,10 +702,25 @@ drm_atomic_get_plane_state(struct drm_atomic_commit *state, return plane_state; } EXPORT_SYMBOL(drm_atomic_get_plane_state); +static void drm_atomic_commit_set_colorop_state(struct drm_atomic_commit *commit, + struct drm_colorop *colorop, + struct drm_colorop_state *colorop_state) +{ + int index = drm_colorop_index(colorop); + + drm_modeset_lock_assert_held(&colorop->plane->mutex); + + commit->colorops[index].state_to_destroy = colorop_state; + commit->colorops[index].old_state = colorop->state; + commit->colorops[index].new_state = colorop_state; + commit->colorops[index].ptr = colorop; + colorop_state->state = commit; +} + /** * drm_atomic_get_colorop_state - get colorop state * @state: global atomic state object * @colorop: colorop to get state object for * @@ -721,11 +736,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 = drm_colorop_index(colorop); + int ret; struct drm_colorop_state *colorop_state; WARN_ON(!state->acquire_ctx); colorop_state = drm_atomic_get_new_colorop_state(state, colorop); @@ -738,15 +753,11 @@ drm_atomic_get_colorop_state(struct drm_atomic_commit *state, colorop_state = drm_atomic_helper_colorop_duplicate_state(colorop); if (!colorop_state) return ERR_PTR(-ENOMEM); - state->colorops[index].state_to_destroy = colorop_state; - state->colorops[index].ptr = colorop; - state->colorops[index].old_state = colorop->state; - state->colorops[index].new_state = colorop_state; - colorop_state->state = state; + drm_atomic_commit_set_colorop_state(state, colorop, colorop_state); drm_dbg_atomic(colorop->dev, "Added [COLOROP:%d:%d] %p state to %p\n", colorop->base.id, colorop->type, colorop_state, state); return colorop_state; -- 2.55.0