42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <[email protected]>
|
|
Date: Sun, 12 Oct 2025 21:23:01 +0200
|
|
Subject: drm/sun4i: mixer: Fix up DE33 channel macros
|
|
|
|
Properly define macros. Till now raw numbers and inappropriate macro was
|
|
used.
|
|
|
|
Reviewed-by: Chen-Yu Tsai <[email protected]>
|
|
Tested-by: Ryan Walklin <[email protected]>
|
|
Signed-off-by: Jernej Skrabec <[email protected]>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_mixer.h | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
@@ -39,6 +39,9 @@
|
|
#define DE3_CH_BASE 0x1000
|
|
#define DE3_CH_SIZE 0x0800
|
|
|
|
+#define DE33_CH_BASE 0x1000
|
|
+#define DE33_CH_SIZE 0x20000
|
|
+
|
|
#define SUN8I_MIXER_BLEND_PIPE_CTL(base) ((base) + 0)
|
|
#define SUN8I_MIXER_BLEND_ATTR_FCOLOR(base, x) ((base) + 0x4 + 0x10 * (x))
|
|
#define SUN8I_MIXER_BLEND_ATTR_INSIZE(base, x) ((base) + 0x8 + 0x10 * (x))
|
|
@@ -242,7 +245,7 @@ static inline u32
|
|
sun8i_channel_base(struct sun8i_mixer *mixer, int channel)
|
|
{
|
|
if (mixer->cfg->de_type == SUN8I_MIXER_DE33)
|
|
- return mixer->cfg->map[channel] * 0x20000 + DE2_CH_SIZE;
|
|
+ return DE33_CH_BASE + mixer->cfg->map[channel] * DE33_CH_SIZE;
|
|
else if (mixer->cfg->de_type == SUN8I_MIXER_DE3)
|
|
return DE3_CH_BASE + channel * DE3_CH_SIZE;
|
|
else
|
|
--
|
|
Armbian
|
|
|