public inbox for linux-clk@vger.kernel.org
 help / color / mirror / Atom feed
From: Ryan Walklin <ryan@testtoast.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Samuel Holland <samuel@sholland.org>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>
Cc: Andre Przywara <andre.przywara@arm.com>,
	Chris Morgan <macroalpha82@gmail.com>,
	Hironori KIKUCHI <kikuchan98@gmail.com>,
	Philippe Simons <simons.philippe@gmail.com>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	dri-devel@lists.freedesktop.org,
	linux-arm-kernel@lists.infradead.org,
	linux-sunxi@lists.linux.dev, devicetree@vger.kernel.org,
	linux-clk@vger.kernel.org, Ryan Walklin <ryan@testtoast.com>,
	Chris Morgan <macromorgan@hotmail.com>
Subject: [PATCH v7 27/27] drm: sun4i: de33: csc: add Display Engine 3.3 (DE33) support
Date: Mon, 17 Feb 2025 07:36:27 +1300	[thread overview]
Message-ID: <20250216183710.8443-28-ryan@testtoast.com> (raw)
In-Reply-To: <20250216183710.8443-3-ryan@testtoast.com>

Like earlier DE versions, the DE33 has a CSC (Color Space Correction)
module. which provides color space conversion between BT2020/BT709, and
dynamic range conversion between SDR/ST2084/HLG.

Add support for the DE33.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
Tested-by: Philippe Simons <simons.philippe@gmail.com>
Tested-by: Chris Morgan <macromorgan@hotmail.com>

--
Changelog v5..v6:
- Amend format_type to sun8i_format_type
- Add Tested-by: tags
---
 drivers/gpu/drm/sun4i/sun8i_csc.c | 98 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/sun4i/sun8i_csc.h |  3 +
 2 files changed, 101 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
index 66c9ee29842cd..2274a82223164 100644
--- a/drivers/gpu/drm/sun4i/sun8i_csc.c
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.c
@@ -238,6 +238,14 @@ static const u32 yuv2yuv_de3[2][3][3][12] = {
 	},
 };
 
+static u32 sun8i_csc_base(struct sun8i_mixer *mixer, int layer)
+{
+	if (mixer->cfg->de_type == sun8i_mixer_de33)
+		return sun8i_channel_base(mixer, layer) - 0x800;
+	else
+		return ccsc_base[mixer->cfg->ccsc][layer];
+}
+
 static void sun8i_csc_setup(struct regmap *map, u32 base,
 			    enum sun8i_format_type fmt_type,
 			    enum drm_color_encoding encoding,
@@ -360,6 +368,92 @@ static void sun8i_de3_ccsc_setup(struct sun8i_mixer *mixer, int layer,
 			   mask, val);
 }
 
+/* extract constant from high word and invert sign if necessary */
+static u32 sun8i_de33_ccsc_get_constant(u32 value)
+{
+	value >>= 16;
+
+	if (value & BIT(15))
+		return 0x400 - (value & 0x3ff);
+
+	return value;
+}
+
+static void sun8i_de33_convert_table(const u32 *src, u32 *dst)
+{
+	dst[0] = sun8i_de33_ccsc_get_constant(src[3]);
+	dst[1] = sun8i_de33_ccsc_get_constant(src[7]);
+	dst[2] = sun8i_de33_ccsc_get_constant(src[11]);
+	memcpy(&dst[3], src, sizeof(u32) * 12);
+	dst[6] &= 0xffff;
+	dst[10] &= 0xffff;
+	dst[14] &= 0xffff;
+}
+
+static void sun8i_de33_ccsc_setup(struct sun8i_mixer *mixer, int layer,
+				  enum sun8i_format_type fmt_type,
+				  enum drm_color_encoding encoding,
+				  enum drm_color_range range)
+{
+	u32 addr, val = 0, base, csc[15];
+	struct sunxi_engine *engine;
+	struct regmap *map;
+	const u32 *table;
+	int i;
+	struct sun8i_color_model model;
+
+	table = yuv2rgb_de3[range][encoding];
+	base = sun8i_csc_base(mixer, layer);
+	model = mixer->color_model;
+	engine = &mixer->engine;
+	map = engine->regs;
+
+	switch (fmt_type) {
+	case FORMAT_TYPE_RGB:
+		if (mixer->color_model.format == MEDIA_BUS_FMT_RGB888_1X24)
+			break;
+		val = SUN8I_CSC_CTRL_EN;
+		sun8i_de33_convert_table(rgb2yuv_de3[mixer->color_model.encoding], csc);
+		regmap_bulk_write(map, SUN50I_CSC_COEFF(base, 0), csc, 15);
+		break;
+	case FORMAT_TYPE_YUV:
+		table = sun8i_csc_get_de3_yuv_table(encoding, range,
+						    model.format,
+						    model.encoding);
+		if (!table)
+			break;
+		val = SUN8I_CSC_CTRL_EN;
+		sun8i_de33_convert_table(table, csc);
+		regmap_bulk_write(map, SUN50I_CSC_COEFF(base, 0), csc, 15);
+		break;
+	case FORMAT_TYPE_YVU:
+		table = sun8i_csc_get_de3_yuv_table(encoding, range,
+						    model.format,
+						    model.encoding);
+		if (!table)
+			table = yuv2yuv_de3[range][encoding][encoding];
+		val = SUN8I_CSC_CTRL_EN;
+		sun8i_de33_convert_table(table, csc);
+		for (i = 0; i < 15; i++) {
+			addr = SUN50I_CSC_COEFF(base, i);
+			if (i > 3) {
+				if (((i - 3) & 3) == 1)
+					addr = SUN50I_CSC_COEFF(base, i + 1);
+				else if (((i - 3) & 3) == 2)
+					addr = SUN50I_CSC_COEFF(base, i - 1);
+			}
+			regmap_write(map, addr, csc[i]);
+		}
+		break;
+	default:
+		val = 0;
+		DRM_WARN("Wrong CSC mode specified.\n");
+		return;
+	}
+
+	regmap_write(map, SUN8I_CSC_CTRL(base), val);
+}
+
 void sun8i_csc_set_ccsc(struct sun8i_mixer *mixer, int layer,
 			enum sun8i_format_type fmt_type,
 			enum drm_color_encoding encoding,
@@ -371,6 +465,10 @@ void sun8i_csc_set_ccsc(struct sun8i_mixer *mixer, int layer,
 		sun8i_de3_ccsc_setup(mixer, layer,
 				     fmt_type, encoding, range);
 		return;
+	} else if (mixer->cfg->de_type == sun8i_mixer_de33) {
+		sun8i_de33_ccsc_setup(mixer, layer, fmt_type,
+				      encoding, range);
+		return;
 	}
 
 	if (layer < mixer->cfg->vi_num) {
diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.h b/drivers/gpu/drm/sun4i/sun8i_csc.h
index 9b63c92782f56..4a06fc43de2d0 100644
--- a/drivers/gpu/drm/sun4i/sun8i_csc.h
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.h
@@ -20,6 +20,9 @@ struct sun8i_mixer;
 #define SUN8I_CSC_CTRL(base)		((base) + 0x0)
 #define SUN8I_CSC_COEFF(base, i)	((base) + 0x10 + 4 * (i))
 
+#define SUN50I_CSC_COEFF(base, i)	((base) + 0x04 + 4 * (i))
+#define SUN50I_CSC_ALPHA(base)		((base) + 0x40)
+
 #define SUN8I_CSC_CTRL_EN		BIT(0)
 
 enum sun8i_format_type {
-- 
2.48.1


      parent reply	other threads:[~2025-02-16 18:41 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-16 18:36 [PATCH v7 02/27] drm: sun4i: de2/de3: Merge CSC functions into one Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 03/27] drm: sun4i: de2/de3: call csc setup also for UI layer Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 04/27] drm: sun4i: de2: Initialize layer fields earlier Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 05/27] drm: sun4i: de3: Add YUV formatter module Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 06/27] drm: sun4i: de3: add format enumeration function to engine Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 07/27] drm: sun4i: de3: add formatter flag to mixer config Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 08/27] drm: sun4i: de3: add YUV support to the DE3 mixer Ryan Walklin
2025-02-22  9:30   ` Jernej Škrabec
2025-02-22 23:36     ` Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 09/27] drm: sun4i: de3: refactor YUV formatter module setup Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 10/27] drm: sun4i: de3: pass mixer reference to ccsc setup function Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 11/27] drm: sun4i: de3: add YUV support to the color space correction module Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 12/27] drm: sun4i: de3: add YUV support to the TCON Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 13/27] drm: sun4i: support YUV formats in VI scaler Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 14/27] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 15/27] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 16/27] drm: sun4i: vi_scaler refactor vi_scaler enablement Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 17/27] drm: sun4i: de2/de3: add generic blender register reference function Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 18/27] drm: sun4i: de2/de3: use generic register reference function for layer configuration Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 19/27] drm: sun4i: de3: Implement AFBC support Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 20/27] dt-bindings: allwinner: add H616 DE33 bus binding Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 21/27] dt-bindings: allwinner: add H616 DE33 clock binding Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 22/27] dt-bindings: allwinner: add H616 DE33 mixer binding Ryan Walklin
2025-02-24 17:56   ` Andre Przywara
2025-03-10  9:30     ` Ryan Walklin
2025-03-10 10:48       ` Andre Przywara
2025-02-16 18:36 ` [PATCH v7 23/27] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 24/27] drm: sun4i: de33: mixer: " Ryan Walklin
2025-02-23  7:15   ` Jernej Škrabec
2025-02-23  7:32     ` Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 25/27] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2025-02-16 18:36 ` [PATCH v7 26/27] drm: sun4i: de33: fmt: " Ryan Walklin
2025-02-16 18:36 ` Ryan Walklin [this message]

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=20250216183710.8443-28-ryan@testtoast.com \
    --to=ryan@testtoast.com \
    --cc=airlied@gmail.com \
    --cc=andre.przywara@arm.com \
    --cc=conor+dt@kernel.org \
    --cc=daniel@ffwll.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jernej.skrabec@gmail.com \
    --cc=kikuchan98@gmail.com \
    --cc=krzk+dt@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-sunxi@lists.linux.dev \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=macroalpha82@gmail.com \
    --cc=macromorgan@hotmail.com \
    --cc=mripard@kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=robh@kernel.org \
    --cc=samuel@sholland.org \
    --cc=sboyd@kernel.org \
    --cc=simons.philippe@gmail.com \
    --cc=tzimmermann@suse.de \
    --cc=wens@csie.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