mirror of
https://github.com/andreili/SBC_builder.git
synced 2025-08-24 03:14:06 +02:00
141 lines
4.9 KiB
Diff
141 lines
4.9 KiB
Diff
From e0de25f60a3535d345b33dcc541c814499151788 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 29 Sep 2024 22:04:44 +1300
|
|
Subject: drm: sun4i: support YUV formats in VI scaler
|
|
|
|
Now that YUV formats are available, enable support in the VI scaler.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
|
|
|
|
Changelog v4..v5:
|
|
- Add commit description
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 85 +++++++++++++++++--------
|
|
1 file changed, 58 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_scaler.c b/drivers/gpu/drm/sun4i/sun8i_vi_scaler.c
|
|
index 7ba75011adf9..2e49a6e5f1f1 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_vi_scaler.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_scaler.c
|
|
@@ -843,6 +843,11 @@ static u32 sun8i_vi_scaler_base(struct sun8i_mixer *mixer, int channel)
|
|
DE2_VI_SCALER_UNIT_SIZE * channel;
|
|
}
|
|
|
|
+static bool sun8i_vi_scaler_is_vi_plane(struct sun8i_mixer *mixer, int channel)
|
|
+{
|
|
+ return true;
|
|
+}
|
|
+
|
|
static int sun8i_vi_scaler_coef_index(unsigned int step)
|
|
{
|
|
unsigned int scale, int_part, float_part;
|
|
@@ -867,44 +872,65 @@ static int sun8i_vi_scaler_coef_index(unsigned int step)
|
|
}
|
|
}
|
|
|
|
-static void sun8i_vi_scaler_set_coeff(struct regmap *map, u32 base,
|
|
- u32 hstep, u32 vstep,
|
|
- const struct drm_format_info *format)
|
|
+static void sun8i_vi_scaler_set_coeff_vi(struct regmap *map, u32 base,
|
|
+ u32 hstep, u32 vstep,
|
|
+ const struct drm_format_info *format)
|
|
{
|
|
const u32 *ch_left, *ch_right, *cy;
|
|
- int offset, i;
|
|
+ int offset;
|
|
|
|
- if (format->hsub == 1 && format->vsub == 1) {
|
|
- ch_left = lan3coefftab32_left;
|
|
- ch_right = lan3coefftab32_right;
|
|
- cy = lan2coefftab32;
|
|
- } else {
|
|
+ if (format->is_yuv) {
|
|
ch_left = bicubic8coefftab32_left;
|
|
ch_right = bicubic8coefftab32_right;
|
|
cy = bicubic4coefftab32;
|
|
+ } else {
|
|
+ ch_left = lan3coefftab32_left;
|
|
+ ch_right = lan3coefftab32_right;
|
|
+ cy = lan2coefftab32;
|
|
}
|
|
|
|
offset = sun8i_vi_scaler_coef_index(hstep) *
|
|
SUN8I_VI_SCALER_COEFF_COUNT;
|
|
- for (i = 0; i < SUN8I_VI_SCALER_COEFF_COUNT; i++) {
|
|
- regmap_write(map, SUN8I_SCALER_VSU_YHCOEFF0(base, i),
|
|
- lan3coefftab32_left[offset + i]);
|
|
- regmap_write(map, SUN8I_SCALER_VSU_YHCOEFF1(base, i),
|
|
- lan3coefftab32_right[offset + i]);
|
|
- regmap_write(map, SUN8I_SCALER_VSU_CHCOEFF0(base, i),
|
|
- ch_left[offset + i]);
|
|
- regmap_write(map, SUN8I_SCALER_VSU_CHCOEFF1(base, i),
|
|
- ch_right[offset + i]);
|
|
- }
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_YHCOEFF0(base, 0),
|
|
+ &lan3coefftab32_left[offset],
|
|
+ SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_YHCOEFF1(base, 0),
|
|
+ &lan3coefftab32_right[offset],
|
|
+ SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_CHCOEFF0(base, 0),
|
|
+ &ch_left[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_CHCOEFF1(base, 0),
|
|
+ &ch_right[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
|
|
offset = sun8i_vi_scaler_coef_index(hstep) *
|
|
SUN8I_VI_SCALER_COEFF_COUNT;
|
|
- for (i = 0; i < SUN8I_VI_SCALER_COEFF_COUNT; i++) {
|
|
- regmap_write(map, SUN8I_SCALER_VSU_YVCOEFF(base, i),
|
|
- lan2coefftab32[offset + i]);
|
|
- regmap_write(map, SUN8I_SCALER_VSU_CVCOEFF(base, i),
|
|
- cy[offset + i]);
|
|
- }
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_YVCOEFF(base, 0),
|
|
+ &lan2coefftab32[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_CVCOEFF(base, 0),
|
|
+ &cy[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+}
|
|
+
|
|
+static void sun8i_vi_scaler_set_coeff_ui(struct regmap *map, u32 base,
|
|
+ u32 hstep, u32 vstep,
|
|
+ const struct drm_format_info *format)
|
|
+{
|
|
+ const u32 *table;
|
|
+ int offset;
|
|
+
|
|
+ offset = sun8i_vi_scaler_coef_index(hstep) *
|
|
+ SUN8I_VI_SCALER_COEFF_COUNT;
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_YHCOEFF0(base, 0),
|
|
+ &lan2coefftab32[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+ offset = sun8i_vi_scaler_coef_index(vstep) *
|
|
+ SUN8I_VI_SCALER_COEFF_COUNT;
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_YVCOEFF(base, 0),
|
|
+ &lan2coefftab32[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
+
|
|
+ table = format->is_yuv ? bicubic4coefftab32 : lan2coefftab32;
|
|
+ offset = sun8i_vi_scaler_coef_index(hstep) *
|
|
+ SUN8I_VI_SCALER_COEFF_COUNT;
|
|
+ regmap_bulk_write(map, SUN8I_SCALER_VSU_CHCOEFF0(base, 0),
|
|
+ &table[offset], SUN8I_VI_SCALER_COEFF_COUNT);
|
|
}
|
|
|
|
void sun8i_vi_scaler_enable(struct sun8i_mixer *mixer, int layer, bool enable)
|
|
@@ -994,6 +1020,11 @@ void sun8i_vi_scaler_setup(struct sun8i_mixer *mixer, int layer,
|
|
SUN8I_SCALER_VSU_CHPHASE(base), chphase);
|
|
regmap_write(mixer->engine.regs,
|
|
SUN8I_SCALER_VSU_CVPHASE(base), cvphase);
|
|
- sun8i_vi_scaler_set_coeff(mixer->engine.regs, base,
|
|
- hscale, vscale, format);
|
|
+
|
|
+ if (sun8i_vi_scaler_is_vi_plane(mixer, layer))
|
|
+ sun8i_vi_scaler_set_coeff_vi(mixer->engine.regs, base,
|
|
+ hscale, vscale, format);
|
|
+ else
|
|
+ sun8i_vi_scaler_set_coeff_ui(mixer->engine.regs, base,
|
|
+ hscale, vscale, format);
|
|
}
|
|
--
|
|
2.35.3
|
|
|