From: Thomas Zimmermann <tzimmermann@suse.de>
To: Maxime Ripard <mripard@kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>
Cc: "Daniel Stone" <daniels@collabora.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Jocelyn Falempe" <jfalempe@redhat.com>,
"Jonas Ådahl" <jadahl@redhat.com>,
"Michel Dänzer" <mdaenzer@redhat.com>,
"Pekka Paalanen" <pekka.paalanen@collabora.com>,
"Sebastian Wick" <sebastian.wick@redhat.com>,
"Simon Ser" <contact@emersion.fr>,
"Victoria Brekenfeld" <victoria@system76.com>,
"Xaver Hugl" <xaver.hugl@kde.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 04/11] drm/atomic: Create function to insert colorop state into a commit
Date: Wed, 9 Sep 2026 08:35:56 +0200 [thread overview]
Message-ID: <727da7ab-9148-4c80-8810-0f31e9290427@suse.de> (raw)
In-Reply-To: <20260908-drm-reset-state-flag-v3-4-905570f387a4@kernel.org>
Am 08.09.26 um 16:35 schrieb Maxime Ripard:
> 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 <mripard@kernel.org>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
with the question of the return value again.
> ---
> 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 f62323679f44..f6a31c9d477d 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;
>
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)
next prev parent reply other threads:[~2026-09-09 6:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-08 14:35 [PATCH v3 00/11] drm: Add DRM_MODE_ATOMIC_RESET flag Maxime Ripard
2026-09-08 14:35 ` [PATCH v3 01/11] drm/atomic: colorop: Rename state to state_to_destroy Maxime Ripard
2026-09-09 6:28 ` Thomas Zimmermann
2026-09-11 13:27 ` (subset) " Maxime Ripard
2026-09-08 14:35 ` [PATCH v3 02/11] drm/atomic: Create function to insert CRTC state into a commit Maxime Ripard
2026-09-09 6:30 ` Thomas Zimmermann
2026-09-08 14:35 ` [PATCH v3 03/11] drm/atomic: Create function to insert plane " Maxime Ripard
2026-09-09 6:34 ` Thomas Zimmermann
2026-09-08 14:35 ` [PATCH v3 04/11] drm/atomic: Create function to insert colorop " Maxime Ripard
2026-09-09 6:35 ` Thomas Zimmermann [this message]
2026-09-08 14:35 ` [PATCH v3 05/11] drm/atomic: Create function to insert private obj " Maxime Ripard
2026-09-09 6:46 ` Thomas Zimmermann
2026-09-08 14:35 ` [PATCH v3 06/11] drm/atomic: Create function to insert connector " Maxime Ripard
2026-09-09 6:52 ` Thomas Zimmermann
2026-09-08 14:35 ` [PATCH v3 07/11] drm/atomic: Add drm_atomic_can_create_state() helper Maxime Ripard
2026-09-09 6:58 ` Thomas Zimmermann
2026-09-08 14:35 ` [PATCH v3 08/11] drm/atomic: Allow filling a commit with pristine object states Maxime Ripard
2026-09-09 7:11 ` Thomas Zimmermann
2026-09-08 14:35 ` [PATCH v3 09/11] drm/atomic-uapi: Add DRM_MODE_ATOMIC_RESET flag Maxime Ripard
2026-09-09 7:13 ` Thomas Zimmermann
2026-09-09 7:24 ` Thomas Zimmermann
2026-09-09 8:22 ` Maxime Ripard
2026-09-08 14:35 ` [PATCH v3 10/11] drm/vkms: Switch container_of helpers to container_of_const Maxime Ripard
2026-09-08 14:35 ` [PATCH v3 11/11] drm/vkms: Add driver-specific plane property for testing Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=727da7ab-9148-4c80-8810-0f31e9290427@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@gmail.com \
--cc=contact@emersion.fr \
--cc=daniels@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=jadahl@redhat.com \
--cc=jfalempe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mdaenzer@redhat.com \
--cc=mripard@kernel.org \
--cc=pekka.paalanen@collabora.com \
--cc=sebastian.wick@redhat.com \
--cc=simona@ffwll.ch \
--cc=victoria@system76.com \
--cc=xaver.hugl@kde.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®