From: "Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>
To: Melissa Wen <mwen@igalia.com>, <airlied@gmail.com>,
<alexander.deucher@amd.com>, <christian.koenig@amd.com>,
<harry.wentland@amd.com>, <maarten.lankhorst@linux.intel.com>,
<mripard@kernel.org>, <simona@ffwll.ch>, <siqueira@igalia.com>,
<sunpeng.li@amd.com>, <tzimmermann@suse.de>
Cc: Alex Hung <alex.hung@amd.com>, Simon Ser <contact@emersion.fr>,
"Uma Shankar" <uma.shankar@intel.com>,
Xaver Hugl <xaver.hugl@kde.org>,
"Pekka Paalanen" <pekka.paalanen@collabora.com>,
Louis Chauvet <louis.chauvet@bootlin.com>,
Matthew Schwartz <matthew.schwartz@linux.dev>,
<amd-gfx@lists.freedesktop.org>, <kernel-dev@igalia.com>,
Rob Clark <robin.clark@oss.qualcomm.com>,
Dmitry Baryshkov <lumag@kernel.org>,
"Abhinav Kumar" <abhinav.kumar@linux.dev>,
Jessica Zhang <jesszhan0024@gmail.com>,
"Sean Paul" <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
<linux-arm-msm@vger.kernel.org>,
<freedreno@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH v5 2/6] drm/atomic: don't set colorop properties of inactive color pipelines
Date: Mon, 18 May 2026 17:12:29 +0530 [thread overview]
Message-ID: <cd1d9fd2-8026-44ad-a0d3-d317dc1fb28d@intel.com> (raw)
In-Reply-To: <20260506192633.16066-3-mwen@igalia.com>
On 5/7/2026 12:53 AM, Melissa Wen wrote:
> Reject attempts to change property values of a colorop that is not
> part of an active plane color pipeline.
>
> Suggested-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
> drivers/gpu/drm/drm_atomic_uapi.c | 34 ++++++++++++++++++++++++++-----
> 1 file changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
> index 5bd5bf6661df..bff8d58f8f12 100644
> --- a/drivers/gpu/drm/drm_atomic_uapi.c
> +++ b/drivers/gpu/drm/drm_atomic_uapi.c
> @@ -1275,15 +1275,38 @@ int drm_atomic_set_property(struct drm_atomic_state *state,
> break;
> }
> case DRM_MODE_OBJECT_COLOROP: {
> - struct drm_colorop *colorop = obj_to_colorop(obj);
> - struct drm_colorop_state *colorop_state;
> + struct drm_colorop *active_colorop, *colorop = obj_to_colorop(obj);
> + struct drm_colorop_state *colorop_state = NULL;
> + struct drm_plane_state *plane_state;
>
> - colorop_state = drm_atomic_get_colorop_state(state, colorop);
> - if (IS_ERR(colorop_state)) {
> - ret = PTR_ERR(colorop_state);
> + plane_state = drm_atomic_get_plane_state(state, colorop->plane);
> + if (IS_ERR(plane_state)) {
> + ret = PTR_ERR(plane_state);
> break;
> }
Hmmm, this creates a dependency on the call order of
drm_atomic_set_property() for color pipeline and the color op. :(
Not sure if there is a good way to solve this.
>
> + /* Check if the colorop obj is part of an active color pipeline */
> + for (active_colorop = plane_state->color_pipeline;
> + active_colorop;
> + active_colorop = active_colorop->next) {
> + if (active_colorop == colorop) {
> + colorop_state = drm_atomic_get_colorop_state(state, colorop);
> + if (IS_ERR(colorop_state)) {
> + ret = PTR_ERR(colorop_state);
> + goto err;
> + }
> + break;
> + }
> + }
> +
> + if (!colorop_state) {
> + drm_dbg_atomic(prop->dev,
> + "[COLOROP:%d:%d] not part of the active pipeline\n",
> + obj->id, colorop->type);
> + ret = -EINVAL;
> + goto err;
> + }
> +
> ret = drm_atomic_colorop_set_property(colorop, colorop_state,
> file_priv, prop, prop_value);
> break;
> @@ -1294,6 +1317,7 @@ int drm_atomic_set_property(struct drm_atomic_state *state,
> break;
> }
>
> +err:
> drm_property_change_valid_put(prop, ref);
> return ret;
> }
next prev parent reply other threads:[~2026-05-18 11:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-06 19:23 [PATCH v5 0/6] drm/atomic: track individual colorop updates Melissa Wen
2026-05-06 19:23 ` [PATCH v5 1/6] drm/atomic: only add colorop state from active color pipeline Melissa Wen
2026-05-18 11:42 ` Borah, Chaitanya Kumar
2026-05-06 19:23 ` [PATCH v5 2/6] drm/atomic: don't set colorop properties of inactive color pipelines Melissa Wen
2026-05-18 11:42 ` Borah, Chaitanya Kumar [this message]
2026-05-19 12:50 ` Melissa Wen
2026-05-06 19:23 ` [PATCH v5 3/6] drm/colorop: Remove read-only comments from interpolation fields Melissa Wen
2026-05-18 11:42 ` Borah, Chaitanya Kumar
2026-05-06 19:23 ` [PATCH v5 4/6] drm/colorop: make lut(1/3)d_interpolation mutable Melissa Wen
2026-05-18 11:43 ` Borah, Chaitanya Kumar
2026-05-06 19:23 ` [PATCH v5 5/6] drm/atomic: track individual colorop updates Melissa Wen
2026-05-18 11:44 ` Borah, Chaitanya Kumar
2026-05-06 19:23 ` [PATCH v5 6/6] drm/amd/display: use plane color_mgmt_changed to track colorop changes Melissa Wen
2026-05-18 11:06 ` [PATCH v5 0/6] drm/atomic: track individual colorop updates Melissa Wen
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=cd1d9fd2-8026-44ad-a0d3-d317dc1fb28d@intel.com \
--to=chaitanya.kumar.borah@intel.com \
--cc=abhinav.kumar@linux.dev \
--cc=airlied@gmail.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=contact@emersion.fr \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=jesszhan0024@gmail.com \
--cc=kernel-dev@igalia.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=louis.chauvet@bootlin.com \
--cc=lumag@kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=marijn.suijten@somainline.org \
--cc=matthew.schwartz@linux.dev \
--cc=mripard@kernel.org \
--cc=mwen@igalia.com \
--cc=pekka.paalanen@collabora.com \
--cc=robin.clark@oss.qualcomm.com \
--cc=sean@poorly.run \
--cc=simona@ffwll.ch \
--cc=siqueira@igalia.com \
--cc=sunpeng.li@amd.com \
--cc=tzimmermann@suse.de \
--cc=uma.shankar@intel.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