From nobody Tue Feb 10 11:33:08 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 ACB9F2F999F for ; Tue, 23 Dec 2025 18:02:28 +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=1766512950; cv=pass; b=Y5009sVckV8dP1VeSlUK41WC3XNnGR1wJpNgogRSag7Fk98z2PASxmAQaMzbEhS//UHI5QG0/BUSFSBu4d02fTlHbD/7zSTL7J9YorTdxvIrNFU+lt2wDb0JF8lCUkd4aoylSVNMV59S+0kMbIEjMUuVuUmwgyoa0Q/Cytasq7c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766512950; c=relaxed/simple; bh=0J2/oCeTaDaWYkPGoTjBPhee+NoUxEjFA15+5WI4AvM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f2dTYS2T5hTgzeYoYTUZd0gW9CGDSsjgn76bKGuOWF+GtNhECAY2ug5fOKca9fwr6+dN8JWvTNhkExgotHGbTV4ZFe0IRV3r1YZ1eLRs4DQWN78sAntmQM6K66BQHeXgYvJ1pYQOScgJPKoxkCKR4UUqgzYmtHMW4oCjlonZWLo= 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=cl64Vq1F; 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="cl64Vq1F" ARC-Seal: i=1; a=rsa-sha256; t=1766512924; cv=none; d=zohomail.com; s=zohoarc; b=WfJBSHvwBxpz/T1hEQ+0DGlss+E9/4l47FVJpgUJA87eIAQzQS8mvNq/hSFRefccnHbtl2S2+Mdq8JcM1Ocg//Crmsa47mfSgsM7pVFgwiqX4OWNlMic6nlO6rgyVdrXRSSnIZrAxWI+pa312twV1h4TLtXaAnj465WdC2U20vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766512924; 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=Y2sg/43B/M/N6T5dk67t/7KTqteR6KXHAqu/Msin4/Y=; b=OjSdcQY4V6k1HrYAmAcEGjxreonNb/RyBEWBIShBXkbMLioPTaB1pJMIHsII4bsAKGqXOYcBifb3mClpQFELGg8r9sjR+saOokUxLh71ROv9I757vCFBAtaklNawmucv+3E/pMknk58xem35Mfmo6riZzvm9mXdw74gjEEADULc= 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=1766512924; 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=Y2sg/43B/M/N6T5dk67t/7KTqteR6KXHAqu/Msin4/Y=; b=cl64Vq1Fb/bP+Ec896+b3tLCBvDAl0tG32I26BG/PuxgzvA9ZVCwa1wRtzrJYjfv OLXonZVVR6HF/fEKnQ9VPQJECObKXmnfQuueMJM4yIipzQlvRcPbhANhrpNYj/Z7Svp WOIz/ob3zdaRiLF3WdasTp23nsR3JskmT8deq/S4= Received: by mx.zohomail.com with SMTPS id 176651292198076.79937415292932; Tue, 23 Dec 2025 10:02:01 -0800 (PST) From: Ariel D'Alessandro Date: Tue, 23 Dec 2025 15:01:22 -0300 Subject: [PATCH v3 02/21] drm/colorop: Allow parenting colorop to CRTC 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-2-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 , Harry Wentland X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1766512902; l=4585; i=ariel.dalessandro@collabora.com; s=20251223; h=from:subject:message-id; bh=+4lFHIOYldd0VRCezp6RS36U7f4KcV6URV+Z9zloWmk=; b=b2spIzcZQKGM2Y/y9vddf+sOUbr2tnLuzWDwuP1EReTKJoKMlIlaLzDTT33I09EwSE+6cTGyb C9ghTeKRmEZCLPFHdxOaOjiE1GkLnJdTRsllx0PUZY5oewz3ies06py 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" In order to allow for post-blend color pipelines, colorops need to be assigned to a crtc rather than a plane. Add a crtc to the colorop struct to enable this. Either the plane or the crtc will be set for any given colorop depending on whether it is part of a pre- or post-blend color pipeline. Signed-off-by: N=C3=ADcolas F. R. A. Prado Co-developed-by: Ariel D'Alessandro Signed-off-by: Ariel D'Alessandro Reviewed-by: Louis Chauvet Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_atomic.c | 6 +++--- drivers/gpu/drm/drm_colorop.c | 25 +++++++++++++++++++++++++ include/drm/drm_colorop.h | 17 +++++++++++++++-- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 6d3ea8056b603..e9022d7ad04b0 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -620,7 +620,7 @@ drm_atomic_get_colorop_state(struct drm_atomic_state *s= tate, if (colorop_state) return colorop_state; =20 - ret =3D drm_modeset_lock(&colorop->plane->mutex, state->acquire_ctx); + ret =3D drm_colorop_modeset_lock(colorop, state->acquire_ctx); if (ret) return ERR_PTR(ret); =20 @@ -2012,10 +2012,10 @@ static void __drm_state_dump(struct drm_device *dev= , struct drm_printer *p, =20 list_for_each_entry(colorop, &config->colorop_list, head) { if (take_locks) - drm_modeset_lock(&colorop->plane->mutex, NULL); + drm_colorop_modeset_lock(colorop, NULL); drm_atomic_colorop_print_state(p, colorop->state); if (take_locks) - drm_modeset_unlock(&colorop->plane->mutex); + drm_colorop_modeset_unlock(colorop); } =20 list_for_each_entry(plane, &config->plane_list, head) { diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c index 44eb823585d2e..bf3b8ff51571b 100644 --- a/drivers/gpu/drm/drm_colorop.c +++ b/drivers/gpu/drm/drm_colorop.c @@ -24,6 +24,7 @@ * */ =20 +#include #include #include #include @@ -597,3 +598,27 @@ void drm_colorop_set_next_property(struct drm_colorop = *colorop, struct drm_color colorop->next =3D next; } EXPORT_SYMBOL(drm_colorop_set_next_property); + +int drm_colorop_modeset_lock(struct drm_colorop *colorop, struct drm_modes= et_acquire_ctx *ctx) +{ + if (colorop->plane) + return drm_modeset_lock(&colorop->plane->mutex, ctx); + + if (colorop->crtc) + return drm_modeset_lock(&colorop->crtc->mutex, ctx); + + drm_err(colorop->dev, "Dangling colorop, it must be attached to a plane o= r a CRTC\n"); + return -EINVAL; +} +EXPORT_SYMBOL(drm_colorop_modeset_lock); + +void drm_colorop_modeset_unlock(struct drm_colorop *colorop) +{ + if (colorop->plane) + drm_modeset_unlock(&colorop->plane->mutex); + else if (colorop->crtc) + drm_modeset_unlock(&colorop->crtc->mutex); + else + drm_err(colorop->dev, "Dangling colorop, it must be attached to a plane = or a CRTC\n"); +} +EXPORT_SYMBOL(drm_colorop_modeset_unlock); diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h index a3a32f9f918c7..49d342b7f8b0b 100644 --- a/include/drm/drm_colorop.h +++ b/include/drm/drm_colorop.h @@ -29,6 +29,7 @@ =20 #include #include +#include #include =20 /* DRM colorop flags */ @@ -223,11 +224,21 @@ struct drm_colorop { /** * @plane: * - * The plane on which the colorop sits. A drm_colorop is always unique - * to a plane. + * The plane on which the colorop sits if it is a pre-blend colorop. + * In this case it is unique to the plane. + * NOTE: plane and crtc are mutually exclusive. */ struct drm_plane *plane; =20 + /** + * @crtc: + * + * The CRTC on which the colorop sits if it is a post-blend colorop. + * In this case it is unique to the CRTC. + * NOTE: plane and crtc are mutually exclusive. + */ + struct drm_crtc *crtc; + /** * @state: * @@ -460,5 +471,7 @@ const char * drm_get_colorop_lut3d_interpolation_name(enum drm_colorop_lut3d_interpolat= ion_type type); =20 void drm_colorop_set_next_property(struct drm_colorop *colorop, struct drm= _colorop *next); +int drm_colorop_modeset_lock(struct drm_colorop *colorop, struct drm_modes= et_acquire_ctx *ctx); +void drm_colorop_modeset_unlock(struct drm_colorop *colorop); =20 #endif /* __DRM_COLOROP_H__ */ --=20 2.51.0