mirror of
https://github.com/armbian/build.git
synced 2025-08-18 21:11:02 +02:00
157 lines
4.6 KiB
Diff
157 lines
4.6 KiB
Diff
From 0d003a88bcacf5f405f3922b0c56b7eecdb68386 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 29 Sep 2024 22:04:58 +1300
|
|
Subject: drm: sun4i: de33: csc: add Display Engine 3.3 (DE33) support
|
|
|
|
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>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_csc.c | 96 +++++++++++++++++++++++++++++++
|
|
drivers/gpu/drm/sun4i/sun8i_csc.h | 3 +
|
|
2 files changed, 99 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
index 2d5a2cf7cba2..45bd1ca06400 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 format_type fmt_type,
|
|
enum drm_color_encoding encoding,
|
|
@@ -358,6 +366,90 @@ static void sun8i_de3_ccsc_setup(struct sunxi_engine *engine, 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 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;
|
|
+
|
|
+ table = yuv2rgb_de3[range][encoding];
|
|
+ base = sun8i_csc_base(mixer, layer);
|
|
+ engine = &mixer->engine;
|
|
+ map = engine->regs;
|
|
+
|
|
+ switch (fmt_type) {
|
|
+ case FORMAT_TYPE_RGB:
|
|
+ if (engine->format == MEDIA_BUS_FMT_RGB888_1X24)
|
|
+ break;
|
|
+ val = SUN8I_CSC_CTRL_EN;
|
|
+ sun8i_de33_convert_table(rgb2yuv_de3[engine->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,
|
|
+ engine->format,
|
|
+ engine->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,
|
|
+ engine->format,
|
|
+ engine->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 format_type fmt_type,
|
|
enum drm_color_encoding encoding,
|
|
@@ -369,6 +461,10 @@ void sun8i_csc_set_ccsc(struct sun8i_mixer *mixer, int layer,
|
|
sun8i_de3_ccsc_setup(&mixer->engine, 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 b7546e06e315..2b762cb79f02 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 format_type {
|
|
--
|
|
2.35.3
|
|
|