From nobody Tue Feb 10 05:42:05 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 4BEDC2E54BB for ; Tue, 23 Dec 2025 18:02:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766512961; cv=pass; b=hMxXMxv3RXcLXSKWDhsmYPw3qDg3eAphcAgpjJwj0zyYvlox4bmvN6QPHtJbjkSr0IV26BHuabEGUKpUJfUN6CvAoP/QyWI+I/RjXUAVD3x2XUgHj0hyTD1lQ+Vq3NHeCYdKhNbKh0ssAETLcOX7Ar2wCeidn+eTX0ty6CXsHWc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766512961; c=relaxed/simple; bh=6DiXp7K1jnAn+WQNqmVykY8AuJ1ELBJ68xuiRl16a2A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rjShPSOPKF2lC+RqWWWGGXYOtVZM8PMs6dO4U7FVGfloJHGV675zodiQeG28p9gE0ZK0s1I+yjj4+hKXBrG47Q+1qy+hdM2O4z2AqMe1AUH6T972YFIE6wFntcfje7HY95LFgeLcD1wd3kArIh8mBHBRgycHQizQZ53wycwfmAc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=ariel.dalessandro@collabora.com header.b=bFx13Ql4; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=ariel.dalessandro@collabora.com header.b="bFx13Ql4" ARC-Seal: i=1; a=rsa-sha256; t=1766512936; cv=none; d=zohomail.com; s=zohoarc; b=EB1B0OrG21X1eSnNqgKo7q1dNymgN4JkBxoNJrlKPot5O454X9/XeouHiA1XzTs56PIWCe2/l+hLaY9MnzoOs1DSszDV1EvASzBgLX80eu0mXrTBd9dsb5qUGK63b9IRiqyNlS6ZFiCjhytZiRgeTRCpPfeusRdyH2tCYrH9RcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766512936; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=IbjeKoPsVDqm9cIIC1WYPu54I9aKOxeOJdsHC/k0hWE=; b=RiRMK3/i3RyBN3CrWZSolnybm/94D2P8KJpP1lQqBMhhysufbfkGbYyBWM3zeaMjfqE+5YmN1fUiHgDVpFIB70cxcbR5HQc44PK9p+CIzoBei06FKxpuRDe2C+XkHEVwgoyVbZ4Ndlb5RulWJ20eaysIfobwjeDzNfVfRzZ+ZmI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=ariel.dalessandro@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1766512936; s=zohomail; d=collabora.com; i=ariel.dalessandro@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=IbjeKoPsVDqm9cIIC1WYPu54I9aKOxeOJdsHC/k0hWE=; b=bFx13Ql4Hbz/AwPDfd28ORBPzbeBWBck+/6ntK0tE4jUmyzFbiUtPefpxQJRzBI/ irr2VY6CTuMEhJ1rj+ALd9fcQE44zgNy57hmgzd58weJQaRz/N/lxpHdP6TdiiuWIUD Dcbn2pnoulSkm4D5wpJ20UEi5WhJyEokWhbZeTDY= Received: by mx.zohomail.com with SMTPS id 1766512934274455.2572037982877; Tue, 23 Dec 2025 10:02:14 -0800 (PST) From: Ariel D'Alessandro Date: Tue, 23 Dec 2025 15:01:24 -0300 Subject: [PATCH v3 04/21] drm/crtc: Add COLOR_PIPELINE property 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: <20251223-mtk-post-blend-color-pipeline-v3-4-7d969f9a37a0@collabora.com> References: <20251223-mtk-post-blend-color-pipeline-v3-0-7d969f9a37a0@collabora.com> In-Reply-To: <20251223-mtk-post-blend-color-pipeline-v3-0-7d969f9a37a0@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Louis Chauvet , Haneen Mohammed , Melissa Wen Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= , Ariel D'Alessandro X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1766512902; l=7203; i=ariel.dalessandro@collabora.com; s=20251223; h=from:subject:message-id; bh=YB1+hkXA1HGdyeKDXoHQeTfPUOFoak8L7NumiJSe/xM=; b=N6SRDG7MQoLpRppDC8gcNccMMa5ye+Iq5+BtPRqqyPyVAeFKxksTFn4S5gD6TyC3Hb2biX7ZL 4Y6ubjCPEGjBm7wVRnoQRvZYRgcABK656WJ18qa+T9LDM2W6R6RyGHV X-Developer-Key: i=ariel.dalessandro@collabora.com; a=ed25519; pk=QZRL9EsSBV3/FhDHi9L/7ZTz2dwa7iyqgl+y1UYaQXQ= X-ZohoMailClient: External From: "N=C3=ADcolas F. R. A. Prado" Add a COLOR_PIPELINE property to the CRTC to allow userspace to set a post-blend color pipeline analogously to how pre-blend color pipelines are set on planes. Signed-off-by: N=C3=ADcolas F. R. A. Prado Co-developed-by: Ariel D'Alessandro Signed-off-by: Ariel D'Alessandro --- drivers/gpu/drm/drm_atomic_uapi.c | 50 +++++++++++++++++++++++++++++++++++= ---- drivers/gpu/drm/drm_crtc.c | 31 ++++++++++++++++++++++++ include/drm/drm_atomic_uapi.h | 2 ++ include/drm/drm_crtc.h | 11 +++++++++ 4 files changed, 90 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index 7320db4b8489f..07d0d224fe58c 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -286,6 +286,34 @@ drm_atomic_set_colorop_for_plane(struct drm_plane_stat= e *plane_state, } EXPORT_SYMBOL(drm_atomic_set_colorop_for_plane); =20 +/** + * drm_atomic_set_colorop_for_crtc - set colorop for crtc + * @crtc_state: atomic state object for the crtc + * @colorop: colorop to use for the crtc + * + * Helper function to select the color pipeline on a crtc by setting + * it to the first drm_colorop element of the pipeline. + */ +void +drm_atomic_set_colorop_for_crtc(struct drm_crtc_state *crtc_state, + struct drm_colorop *colorop) +{ + struct drm_crtc *crtc =3D crtc_state->crtc; + + if (colorop) + drm_dbg_atomic(crtc->dev, + "Set [COLOROP:%d] for [CRTC:%d:%s] state %p\n", + colorop->base.id, crtc->base.id, crtc->name, + crtc_state); + else + drm_dbg_atomic(crtc->dev, + "Set [NOCOLOROP] for [CRTC:%d:%s] state %p\n", + crtc->base.id, crtc->name, crtc_state); + + crtc_state->color_pipeline =3D colorop; +} +EXPORT_SYMBOL(drm_atomic_set_colorop_for_crtc); + /** * drm_atomic_set_crtc_for_connector - set CRTC for connector * @conn_state: atomic state object for the connector @@ -394,8 +422,8 @@ static s32 __user *get_out_fence_for_connector(struct d= rm_atomic_state *state, } =20 static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, - struct drm_crtc_state *state, struct drm_property *property, - uint64_t val) + struct drm_crtc_state *state, struct drm_file *file_priv, + struct drm_property *property, uint64_t val) { struct drm_device *dev =3D crtc->dev; struct drm_mode_config *config =3D &dev->mode_config; @@ -404,7 +432,17 @@ static int drm_atomic_crtc_set_property(struct drm_crt= c *crtc, =20 if (property =3D=3D config->prop_active) state->active =3D val; - else if (property =3D=3D config->prop_mode_id) { + else if (property =3D=3D crtc->color_pipeline_property) { + /* find DRM colorop object */ + struct drm_colorop *colorop =3D NULL; + + colorop =3D drm_colorop_find(dev, file_priv, val); + + if (val && !colorop) + return -EACCES; + + drm_atomic_set_colorop_for_crtc(state, colorop); + } else if (property =3D=3D config->prop_mode_id) { struct drm_property_blob *mode =3D drm_property_lookup_blob(dev, val); ret =3D drm_atomic_set_mode_prop_for_crtc(state, mode); @@ -489,6 +527,8 @@ drm_atomic_crtc_get_property(struct drm_crtc *crtc, *val =3D state->scaling_filter; else if (property =3D=3D crtc->sharpness_strength_property) *val =3D state->sharpness_strength; + else if (property =3D=3D crtc->color_pipeline_property) + *val =3D (state->color_pipeline) ? state->color_pipeline->base.id : 0; else if (crtc->funcs->atomic_get_property) return crtc->funcs->atomic_get_property(crtc, state, property, val); else { @@ -1050,6 +1090,8 @@ int drm_atomic_get_property(struct drm_mode_object *o= bj, =20 if (colorop->plane) WARN_ON(!drm_modeset_is_locked(&colorop->plane->mutex)); + else if (colorop->crtc) + WARN_ON(!drm_modeset_is_locked(&colorop->crtc->mutex)); =20 ret =3D drm_atomic_colorop_get_property(colorop, colorop->state, propert= y, val); break; @@ -1206,7 +1248,7 @@ int drm_atomic_set_property(struct drm_atomic_state *= state, } =20 ret =3D drm_atomic_crtc_set_property(crtc, - crtc_state, prop, prop_value); + crtc_state, file_priv, prop, prop_value); break; } case DRM_MODE_OBJECT_PLANE: { diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index a7797d260f1e2..133ff9212fbc4 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -994,3 +994,34 @@ bool drm_crtc_in_clone_mode(struct drm_crtc_state *crt= c_state) return hweight32(crtc_state->encoder_mask) > 1; } EXPORT_SYMBOL(drm_crtc_in_clone_mode); + +/** + * drm_crtc_create_color_pipeline_property - create a new color pipeline + * property + * + * @crtc: drm CRTC + * @pipelines: list of pipelines + * @num_pipelines: number of pipelines + * + * Create the COLOR_PIPELINE CRTC property to specify color pipelines on + * the CRTC. + * + * RETURNS: + * Zero for success or -errno + */ +int drm_crtc_create_color_pipeline_property(struct drm_crtc *crtc, + const struct drm_prop_enum_list *pipelines, + int num_pipelines) +{ + struct drm_property *prop; + + prop =3D drm_property_create_color_pipeline(crtc->dev, &crtc->base, + pipelines, num_pipelines); + if (IS_ERR(prop)) + return PTR_ERR(prop); + + crtc->color_pipeline_property =3D prop; + + return 0; +} +EXPORT_SYMBOL(drm_crtc_create_color_pipeline_property); diff --git a/include/drm/drm_atomic_uapi.h b/include/drm/drm_atomic_uapi.h index 4363155233267..4dc191f6f929d 100644 --- a/include/drm/drm_atomic_uapi.h +++ b/include/drm/drm_atomic_uapi.h @@ -52,6 +52,8 @@ void drm_atomic_set_fb_for_plane(struct drm_plane_state *= plane_state, struct drm_framebuffer *fb); void drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state, struct drm_colorop *colorop); +void drm_atomic_set_colorop_for_crtc(struct drm_crtc_state *crtc_state, + struct drm_colorop *colorop); int __must_check drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state, struct drm_crtc *crtc); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 8490f4bc31260..b3c9818715851 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1113,6 +1113,14 @@ struct drm_crtc { */ struct drm_property *sharpness_strength_property; =20 + /** + * @color_pipeline_property: + * + * Optional "COLOR_PIPELINE" enum property for specifying + * a color pipeline to use on the CRTC. + */ + struct drm_property *color_pipeline_property; + /** * @state: * @@ -1348,6 +1356,9 @@ static inline struct drm_crtc *drm_crtc_find(struct d= rm_device *dev, =20 int drm_crtc_create_scaling_filter_property(struct drm_crtc *crtc, unsigned int supported_filters); +int drm_crtc_create_color_pipeline_property(struct drm_crtc *crtc, + const struct drm_prop_enum_list *pipelines, + int num_pipelines); bool drm_crtc_in_clone_mode(struct drm_crtc_state *crtc_state); int drm_crtc_create_sharpness_strength_property(struct drm_crtc *crtc); #endif /* __DRM_CRTC_H__ */ --=20 2.51.0