]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/sun4i: mixer: Fix up DE33 channel macros
authorJernej Skrabec <jernej.skrabec@gmail.com>
Tue, 4 Nov 2025 18:09:13 +0000 (19:09 +0100)
committerChen-Yu Tsai <wens@kernel.org>
Wed, 12 Nov 2025 09:18:21 +0000 (17:18 +0800)
Properly define macros. Till now raw numbers and inappropriate macro was
used.

Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Ryan Walklin <ryan@testtoast.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://patch.msgid.link/20251104180942.61538-2-jernej.skrabec@gmail.com
Signed-off-by: Chen-Yu Tsai <wens@kernel.org>
drivers/gpu/drm/sun4i/sun8i_mixer.h

index a1c1cbccc654f174026e313fc455dda4c849e163..b5badfa2c997e81b0cfd0a47d60e3f685fd66c6d 100644 (file)
@@ -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