From nobody Thu Oct 2 11:50:24 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 DD7EB22258C for ; Thu, 18 Sep 2025 00:45:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758156344; cv=none; b=H1f+4G6SMuuljhwn3cPkcxNuQDuY5njJjnHmzK5rGz1JRhkDtQs6PkM43JuSVS6RVVJ4Z2dcnDa4pWZ+lNf1VjMULa5N+M0+FS/DWSfQ5fulaYrpWeqpN4JcMIC6uTINOoVE3fnDTkrznoU/ICn/+i/cNNpUc1xueM+aQ9uX4O0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758156344; c=relaxed/simple; bh=Ubb2RwOlCe865fSK4jeKJoKkExIANG86ANonO6mf70A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Lk7QcaENljuOuPMUXVt+WWBoNCI04hUXGaYCchBz/qsrs0x0S5IMsuJLiXBErWArI1tSpWAVk6ZUKUYQ6/IPqfPcWSZyrfrxtquKn7PCt31kTBz8374NE2w+VCw+mBLypoa+v7rN73sVUeu8ExUJrP3a+HhOdAaYlCQj92O59VE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=qv9fKRr4; arc=none smtp.client-ip=148.251.105.195 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 (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="qv9fKRr4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1758156341; bh=Ubb2RwOlCe865fSK4jeKJoKkExIANG86ANonO6mf70A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qv9fKRr4nqEe7T9EM5WO9nUsxOf2nNDGBQkY/d/B1m17/4+bKYzbEkXxUnqPjxDMo 0g6f6UmY0zWxz2jMGxrUEhcdYZfZVX5Rk+8uOb3F67cXh4bQ5WllKToo9r2OV/yN7F 6KFlY9Jt/G0cAyOIXcQqt5GqoRYjzoVtKGPYLJi3KZ+ghsfnPL/TrYEMF9XZX5U80g /YBNrfjrBT8+92t+s6oWpiR3/KTzY+sU5v8xglHHv59TDTZhPA/9Sbi9bRssB+YWkC yRDtaazh0CoyJdsW4fX3nP75wkCTfjZVI0Sw+JP4EtcXvATJgh98EZ1cdFx7f/3Q+A kpk6FHUGlXb4g== Received: from [127.0.1.1] (unknown [IPv6:2600:4041:5b1a:9400:62f0:406e:ac79:4a96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id C793317E13C1; Thu, 18 Sep 2025 02:45:34 +0200 (CEST) From: =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= Date: Wed, 17 Sep 2025 20:43:28 -0400 Subject: [PATCH RFC v2 19/20] drm/vkms: Introduce support for post-blend color pipeline 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: <20250917-mtk-post-blend-color-pipeline-v2-19-ac4471b44758@collabora.com> References: <20250917-mtk-post-blend-color-pipeline-v2-0-ac4471b44758@collabora.com> In-Reply-To: <20250917-mtk-post-blend-color-pipeline-v2-0-ac4471b44758@collabora.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Haneen Mohammed , Melissa Wen Cc: Alex Hung , wayland-devel@lists.freedesktop.org, harry.wentland@amd.com, leo.liu@amd.com, ville.syrjala@linux.intel.com, pekka.paalanen@collabora.com, contact@emersion.fr, mwen@igalia.com, jadahl@redhat.com, sebastian.wick@redhat.com, shashank.sharma@amd.com, agoins@nvidia.com, joshua@froggi.es, mdaenzer@redhat.com, aleixpol@kde.org, xaver.hugl@gmail.com, victoria@system76.com, uma.shankar@intel.com, quic_naseer@quicinc.com, quic_cbraga@quicinc.com, quic_abhinavk@quicinc.com, marcan@marcan.st, Liviu.Dudau@arm.com, sashamcintosh@google.com, chaitanya.kumar.borah@intel.com, louis.chauvet@bootlin.com, mcanal@igalia.com, kernel@collabora.com, daniels@collabora.com, leandro.ribeiro@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?N=C3=ADcolas_F=2E_R=2E_A=2E_Prado?= , Simona Vetter X-Mailer: b4 0.14.2 Introduce a post-blend color pipeline with the same colorop blocks as the pre-blend color pipeline. Signed-off-by: N=C3=ADcolas F. R. A. Prado --- drivers/gpu/drm/vkms/vkms_colorop.c | 98 ++++++++++++++++++++++++++++++++= ++++ drivers/gpu/drm/vkms/vkms_composer.c | 5 +- drivers/gpu/drm/vkms/vkms_crtc.c | 1 + drivers/gpu/drm/vkms/vkms_drv.h | 1 + 4 files changed, 104 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c b/drivers/gpu/drm/vkms/vkm= s_colorop.c index 5924ae2bd40fc904048f99bc9b96308140709e25..54c512db68eef16435d5f794537= 84f7784d540fb 100644 --- a/drivers/gpu/drm/vkms/vkms_colorop.c +++ b/drivers/gpu/drm/vkms/vkms_colorop.c @@ -98,6 +98,86 @@ vkms_initialize_pre_blend_color_pipeline(struct drm_plan= e *plane, return ret; } =20 +static int +vkms_initialize_post_blend_color_pipeline(struct drm_crtc *crtc, + struct drm_prop_enum_list *list) +{ + struct drm_colorop *ops[MAX_COLOR_PIPELINE_OPS]; + struct drm_device *dev =3D crtc->dev; + int ret; + int i =3D 0; + + memset(ops, 0, sizeof(ops)); + + /* 1st op: 1d curve */ + ops[i] =3D kzalloc(sizeof(*ops[i]), GFP_KERNEL); + if (!ops[i]) { + ret =3D -ENOMEM; + goto cleanup; + } + + ret =3D drm_crtc_colorop_curve_1d_init(dev, ops[i], crtc, supported_tfs, + DRM_COLOROP_FLAG_ALLOW_BYPASS); + if (ret) + goto cleanup; + + list->type =3D ops[i]->base.id; + list->name =3D kasprintf(GFP_KERNEL, "Color Pipeline %d", ops[i]->base.id= ); + + i++; + + /* 2nd op: 3x4 matrix */ + ops[i] =3D kzalloc(sizeof(*ops[i]), GFP_KERNEL); + if (!ops[i]) { + ret =3D -ENOMEM; + goto cleanup; + } + + ret =3D drm_crtc_colorop_ctm_3x4_init(dev, ops[i], crtc, DRM_COLOROP_FLAG= _ALLOW_BYPASS); + if (ret) + goto cleanup; + + drm_colorop_set_next_property(ops[i - 1], ops[i]); + + i++; + + /* 3rd op: 3x4 matrix */ + ops[i] =3D kzalloc(sizeof(*ops[i]), GFP_KERNEL); + if (!ops[i]) { + ret =3D -ENOMEM; + goto cleanup; + } + + ret =3D drm_crtc_colorop_ctm_3x4_init(dev, ops[i], crtc, DRM_COLOROP_FLAG= _ALLOW_BYPASS); + if (ret) + goto cleanup; + + drm_colorop_set_next_property(ops[i - 1], ops[i]); + + i++; + + /* 4th op: 1d curve */ + ops[i] =3D kzalloc(sizeof(*ops[i]), GFP_KERNEL); + if (!ops[i]) { + ret =3D -ENOMEM; + goto cleanup; + } + + ret =3D drm_crtc_colorop_curve_1d_init(dev, ops[i], crtc, supported_tfs, + DRM_COLOROP_FLAG_ALLOW_BYPASS); + if (ret) + goto cleanup; + + drm_colorop_set_next_property(ops[i - 1], ops[i]); + + return 0; + +cleanup: + drm_colorop_pipeline_destroy(dev); + + return ret; +} + int vkms_initialize_pre_blend_colorops(struct drm_plane *plane) { struct drm_prop_enum_list pipeline; @@ -115,3 +195,21 @@ int vkms_initialize_pre_blend_colorops(struct drm_plan= e *plane) =20 return 0; } + +int vkms_initialize_post_blend_colorops(struct drm_crtc *crtc) +{ + struct drm_prop_enum_list pipeline; + int ret; + + /* Add color pipeline */ + ret =3D vkms_initialize_post_blend_color_pipeline(crtc, &pipeline); + if (ret) + return ret; + + /* Create COLOR_PIPELINE property and attach */ + ret =3D drm_crtc_create_color_pipeline_property(crtc, &pipeline, 1); + if (ret) + return ret; + + return 0; +} diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 05e1551d6330e4dc14563d3a399b3544d11c6576..efe09538768b01108a305f0ace7= 65246220b487b 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -495,7 +495,10 @@ static void blend(struct vkms_writeback_job *wb, blend_line(plane[i], y, crtc_x_limit, stage_buffer, output_buffer); } =20 - apply_lut(crtc_state, output_buffer); + if (crtc_state->base.color_pipeline_enabled) + color_transform(crtc_state->base.color_pipeline, output_buffer); + else + apply_lut(crtc_state, output_buffer); =20 *crc32 =3D crc32_le(*crc32, (void *)output_buffer->pixels, row_size); =20 diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index e60573e0f3e9510252e1f198b00e28bcc7987620..04737c1fb70e4f0aef480a180e5= 7a76fbc279dfa 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -295,6 +295,7 @@ struct vkms_output *vkms_crtc_init(struct drm_device *d= ev, struct drm_plane *pri } =20 drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE); + vkms_initialize_post_blend_colorops(crtc); =20 spin_lock_init(&vkms_out->lock); spin_lock_init(&vkms_out->composer_lock); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 37ee569474223b2cf01e3cc0e4f119777533ae23..a0308c2263d1858a72906853960= ea7d1bbecd03e 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -306,5 +306,6 @@ int vkms_enable_writeback_connector(struct vkms_device = *vkmsdev, struct vkms_out =20 /* Colorops */ int vkms_initialize_pre_blend_colorops(struct drm_plane *plane); +int vkms_initialize_post_blend_colorops(struct drm_crtc *crtc); =20 #endif /* _VKMS_DRV_H_ */ --=20 2.50.1