45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
Date: Tue, 18 Feb 2020 19:24:29 +0100
|
|
Subject: [PATCH] drm/sun4i: csc: Rework DE3 CSC macros
|
|
|
|
Rework DE3 CSC macros to take just one coordinate instead of two. This
|
|
will make its usage easier in subsequent commit.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_csc.c | 2 +-
|
|
drivers/gpu/drm/sun4i/sun8i_mixer.h | 6 ++----
|
|
2 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
index 781955dd4995..5c6ad643dae2 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.c
|
|
@@ -194,7 +194,7 @@ static void sun8i_de3_ccsc_set_coefficients(struct regmap *map, int layer,
|
|
return;
|
|
}
|
|
|
|
- base_reg = SUN50I_MIXER_BLEND_CSC_COEFF(DE3_BLD_BASE, layer, 0, 0);
|
|
+ base_reg = SUN50I_MIXER_BLEND_CSC_COEFF(DE3_BLD_BASE, layer, 0);
|
|
regmap_bulk_write(map, base_reg, table, 12);
|
|
}
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
index 7576b523fdbb..ea4fa6fe567a 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
@@ -50,10 +50,8 @@
|
|
#define SUN8I_MIXER_BLEND_CK_MIN(base, x) ((base) + 0xe0 + 0x04 * (x))
|
|
#define SUN8I_MIXER_BLEND_OUTCTL(base) ((base) + 0xfc)
|
|
#define SUN50I_MIXER_BLEND_CSC_CTL(base) ((base) + 0x100)
|
|
-#define SUN50I_MIXER_BLEND_CSC_COEFF(base, layer, x, y) \
|
|
- ((base) + 0x110 + (layer) * 0x30 + (x) * 0x10 + 4 * (y))
|
|
-#define SUN50I_MIXER_BLEND_CSC_CONST(base, layer, i) \
|
|
- ((base) + 0x110 + (layer) * 0x30 + (i) * 0x10 + 0x0c)
|
|
+#define SUN50I_MIXER_BLEND_CSC_COEFF(base, layer, x) \
|
|
+ ((base) + 0x110 + (layer) * 0x30 + (x) * 4)
|
|
|
|
#define SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK GENMASK(12, 8)
|
|
#define SUN8I_MIXER_BLEND_PIPE_CTL_EN(pipe) BIT(8 + pipe)
|