diff options
| author |   Jernej Skrabec <jernej.skrabec@siol.net> | 2017-12-01 07:05:31 +0100 |
|---|---|---|
| committer |   Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-12-05 13:22:42 +0100 |
| commit | bb940be791ebf704f1736e2f5ffd8301df5f145e (patch) | |
| tree | d280685e44ad2d789689a7f8ba91eb290bfd2490 /drivers/gpu/drm/sun4i/sun8i_mixer.c | |
| parent | drm/sun4i: Set blending mode for all channels (DE2) (diff) | |
| download | linux-dev-bb940be791ebf704f1736e2f5ffd8301df5f145e.tar.xz linux-dev-bb940be791ebf704f1736e2f5ffd8301df5f145e.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun8i_mixer.c')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun8i_mixer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 23659ce1cf27..c7d4ccd605e0 100644 --- 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), |