55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 29 Sep 2024 22:04:41 +1300
|
|
Subject: drm: sun4i: de3: pass engine reference to ccsc setup function
|
|
|
|
Configuration of the DE3 colorspace and dynamic range correction module
|
|
requires knowledge of the current video format and encoding.
|
|
|
|
Pass the display engine by reference to the csc setup function, rather
|
|
than the register map alone, to allow access to this information.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_csc.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
@@ -148,17 +148,19 @@ static void sun8i_csc_setup(struct regmap *map, u32 base,
|
|
regmap_write(map, SUN8I_CSC_CTRL(base), val);
|
|
}
|
|
|
|
-static void sun8i_de3_ccsc_setup(struct regmap *map, int layer,
|
|
+static void sun8i_de3_ccsc_setup(struct sunxi_engine *engine, int layer,
|
|
enum format_type fmt_type,
|
|
enum drm_color_encoding encoding,
|
|
enum drm_color_range range)
|
|
{
|
|
u32 addr, val, mask;
|
|
+ struct regmap *map;
|
|
const u32 *table;
|
|
int i;
|
|
|
|
mask = SUN50I_MIXER_BLEND_CSC_CTL_EN(layer);
|
|
table = yuv2rgb_de3[range][encoding];
|
|
+ map = engine->regs;
|
|
|
|
switch (fmt_type) {
|
|
case FORMAT_TYPE_RGB:
|
|
@@ -204,7 +206,7 @@ void sun8i_csc_set_ccsc(struct sun8i_mixer *mixer, int layer,
|
|
u32 base;
|
|
|
|
if (mixer->cfg->is_de3) {
|
|
- sun8i_de3_ccsc_setup(mixer->engine.regs, layer,
|
|
+ sun8i_de3_ccsc_setup(&mixer->engine, layer,
|
|
fmt_type, encoding, range);
|
|
return;
|
|
}
|
|
--
|
|
Armbian
|
|
|