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 C00EC43E092 for ; Wed, 12 Aug 2026 12:57:16 +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=1786539445; cv=none; b=fNmvJnat3uR75zWPlu7xZnlsjO4hghjNfI9w020HrE+L6B7xWlq1Mz93VF9hbT5d57wRLr/1tT8URgSq1necD7YD4yHv5XQh3/J9hW80ZN4PqVKBJpvNgiB90eLn4x3H54V8NYKPlf1oUrxm/qqho+nGJbMB3qepRgCfUhDXy94= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786539445; c=relaxed/simple; bh=pZKlOKaPQ0ZMNJ3wdm+9LLNfg+R0yJMvj0WSw22/NaY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M45rlbTfDWxIITtT/7CFQC4nMjALr23xO4pMtdOAa8VaGbXLbTMUOoy5y/6HYDV4kDfaNyV6/uV/1sr/2teZNylk9uiGCFYTYpBEBSQ4mXyvzeMksDO0HfCSC4xesAxFCH4ieDe1I3WMCQb97Z9Xgf4+1wTPI9ja9KtbT+mwwkg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SLwyfRPj; 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="SLwyfRPj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E6071F00A3A; Wed, 12 Aug 2026 12:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786539434; bh=k8ycKUnGwpQ4AwzxzEo1cZNOe6UNyjcDqVjSThLSyEE=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=SLwyfRPj3ehhwkDxBzq9XVgPSFCFDo9zesTEntZ3G0P0Q3lwwcSqJOuA7u5YsL1xI r4mVJhd3yJwyuJHcLrScGbg5d8w7ov6T8BgUQhaseOeZ/zCeIQa1TtmXvprh8sj57Q f/RMDMiNmhT/gXuZpuR7NpBRp7lTCoYGc3KZx7cJz9fU+futqPgN5mmRCJJG1aUBkQ y25OWVxvGJWeFpMe9sLgI04eNeX/XPmcn03Y3O+Iuas54Rr35J1XKCTn4SPnvm7E2I Hnl201m0XFso2hpgpHFeXr8fEX7WLFOdCUGFAR/JfiUY1PyelH5GE14DTQkF3b801K sFvPweca4UBqg== From: Maxime Ripard Date: Wed, 12 Aug 2026 14:56:59 +0200 Subject: [PATCH RFC v2 4/9] 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: 7bit Message-Id: <20260812-drm-reset-state-flag-v2-4-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=2972; i=mripard@kernel.org; h=from:subject:message-id; bh=pZKlOKaPQ0ZMNJ3wdm+9LLNfg+R0yJMvj0WSw22/NaY=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDFk1uXOUgmOv7Y9xEdHNqIg6ru7732X3puj7ex389Dd8V OwrvCjYMZWFQZiTQVZMkeWJTNjp5e2LqxzsV/6AmcPKBDKEgYtTACbCrM9YK8RztlbqEN9W5pVT pdxyapx2CB/bZr7T8dmusNvhVro9xbrPwvY/aXf6/GLnlIUVfmd3Mza0SQgILln7w4mHafenn0z VUQcY19rcYo6alL7S4tyMdTVhPvur4vbNk7Xrcvh49I1GXCsA 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 2ac26ed64823..e89e1d18c783 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, return plane_state; } EXPORT_SYMBOL(drm_atomic_get_plane_state); +static int 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; + + 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 = 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); @@ -740,15 +757,15 @@ 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; + ret = drm_atomic_commit_set_colorop_state(state, colorop, colorop_state); + if (ret) { + drm_colorop_atomic_destroy_state(colorop, colorop_state); + return ERR_PTR(ret); + } 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