Skip to content

Commit

Permalink
drm/sun4i: Fix DE2 mixer size
Browse files Browse the repository at this point in the history 
DE2 mixer is always 0x6000 bytes in size on all known SoCs.

While at it, introduce a macro for that.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181104182705.18047-11-jernej.skrabec@siol.net
  • Loading branch information
Jernej Skrabec authored and Maxime Ripard committed Nov 5, 2018
1 parent 4b09c07 commit 218d6a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/sun4i/sun8i_mixer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
base = sun8i_blender_base(mixer);

/* Reset the registers */
for (i = 0x0; i < 0x20000; i += 4)
for (i = 0; i < DE2_MIXER_UNIT_SIZE; i += 4)
regmap_write(mixer->engine.regs, i, 0);

/* Enable the mixer */
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/sun4i/sun8i_mixer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

#define SUN8I_MIXER_GLOBAL_DBUFF_ENABLE BIT(0)

#define DE2_MIXER_UNIT_SIZE 0x6000

#define DE2_BLD_BASE 0x1000
#define DE2_CH_BASE 0x2000
#define DE2_CH_SIZE 0x1000
Expand Down

0 comments on commit 218d6a3

Please sign in to comment.