drm/sun4i: Rename some macros in DE2 driver

Now that some knowledge of DE2 is gained, rename or add some macros to
make code more readable.

Max channel macro is removed, since it is not used and it is not clear
if it has right value. Structures in BSP driver shows possibility of 5
channels maximum although there is no SoC with such configuration.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171201060550.10392-9-jernej.skrabec@siol.net

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 23659ce1cf27d33117ad3c1dde662218e0e1df22..c7d4ccd605e05f970ca22f50617b350c685bbda3 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -323,8 +323,9 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
                     SUN8I_MIXER_BLEND_COLOR_BLACK);
 
        /* Initialize blender */
-       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_FCOLOR_CTL,
-                    SUN8I_MIXER_BLEND_FCOLOR_CTL_DEF);
+       regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_PIPE_CTL,
+                    SUN8I_MIXER_BLEND_PIPE_CTL_EN(0) |
+                    SUN8I_MIXER_BLEND_PIPE_CTL_FC_EN(0));
 
        regmap_write(mixer->engine.regs,
                     SUN8I_MIXER_BLEND_ATTR_FCOLOR(0),

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
index 9b50733298b8db3d45019901b41ac2addcb1b117..76f0b2bd91e264e9018c754ab5945c1ebd6adb62 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
@@ -16,8 +16,6 @@
 
 #include "sunxi_engine.h"
 
-#define SUN8I_MIXER_MAX_CHAN_COUNT             4
-
 #define SUN8I_MIXER_SIZE(w, h)                 (((h) - 1) << 16 | ((w) - 1))
 #define SUN8I_MIXER_COORD(x, y)                        ((y) << 16 | (x))
 
@@ -26,14 +24,14 @@
 #define SUN8I_MIXER_GLOBAL_DBUFF               0x8
 #define SUN8I_MIXER_GLOBAL_SIZE                        0xc
 
-#define SUN8I_MIXER_GLOBAL_CTL_RT_EN           0x1
+#define SUN8I_MIXER_GLOBAL_CTL_RT_EN           BIT(0)
 
-#define SUN8I_MIXER_GLOBAL_DBUFF_ENABLE                0x1
+#define SUN8I_MIXER_GLOBAL_DBUFF_ENABLE                BIT(0)
 
-#define SUN8I_MIXER_BLEND_FCOLOR_CTL           0x1000
+#define SUN8I_MIXER_BLEND_PIPE_CTL             0x1000
 #define SUN8I_MIXER_BLEND_ATTR_FCOLOR(x)       (0x1004 + 0x10 * (x) + 0x0)
 #define SUN8I_MIXER_BLEND_ATTR_INSIZE(x)       (0x1004 + 0x10 * (x) + 0x4)
-#define SUN8I_MIXER_BLEND_ATTR_OFFSET(x)       (0x1004 + 0x10 * (x) + 0x8)
+#define SUN8I_MIXER_BLEND_ATTR_COORD(x)                (0x1004 + 0x10 * (x) + 0x8)
 #define SUN8I_MIXER_BLEND_ROUTE                        0x1080
 #define SUN8I_MIXER_BLEND_PREMULTIPLY          0x1084
 #define SUN8I_MIXER_BLEND_BKCOLOR              0x1088
@@ -45,10 +43,11 @@
 #define SUN8I_MIXER_BLEND_CK_MIN(x)            (0x10e0 + 0x04 * (x))
 #define SUN8I_MIXER_BLEND_OUTCTL               0x10fc
 
+#define SUN8I_MIXER_BLEND_PIPE_CTL_EN(pipe)    BIT(8 + pipe)
+#define SUN8I_MIXER_BLEND_PIPE_CTL_FC_EN(pipe) BIT(pipe)
 /* colors are always in AARRGGBB format */
 #define SUN8I_MIXER_BLEND_COLOR_BLACK          0xff000000
 /* The following numbers are some still unknown magic numbers */
-#define SUN8I_MIXER_BLEND_FCOLOR_CTL_DEF       0x00000101
 #define SUN8I_MIXER_BLEND_MODE_DEF             0x03010301
 
 #define SUN8I_MIXER_BLEND_OUTCTL_INTERLACED    BIT(1)