Commit 7f11f1da authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

drm/sun4i: Remove setting default values in DE2 driver 



Premultiply and color key control registers are already set to zero by
initialization code few lines above. Furthermore, it seems that
colorkeying doesn't really work. It's not used in BSP driver and
experiments with it all failed.

Just remove the code.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171201060550.10392-6-jernej.skrabec@siol.net
parent 66bda1a6

drivers/gpu/drm/sun4i/sun8i_mixer.c

+0 −4
Original line number Diff line number Diff line
@@ -320,14 +320,10 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, 
	/* 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_PREMULTIPLY,

		     SUN8I_MIXER_BLEND_PREMULTIPLY_DEF);

	regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_BKCOLOR,

		     SUN8I_MIXER_BLEND_BKCOLOR_DEF);

	regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_MODE(0),

		     SUN8I_MIXER_BLEND_MODE_DEF);

	regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_CK_CTL,

		     SUN8I_MIXER_BLEND_CK_CTL_DEF);



	regmap_write(mixer->engine.regs,

		     SUN8I_MIXER_BLEND_ATTR_FCOLOR(0),

drivers/gpu/drm/sun4i/sun8i_mixer.h

+0 −2
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ 
/* The following numbers are some still unknown magic numbers */

#define SUN8I_MIXER_BLEND_ATTR_FCOLOR_DEF	0xff000000

#define SUN8I_MIXER_BLEND_FCOLOR_CTL_DEF	0x00000101

#define SUN8I_MIXER_BLEND_PREMULTIPLY_DEF	0x0

#define SUN8I_MIXER_BLEND_BKCOLOR_DEF		0xff000000

#define SUN8I_MIXER_BLEND_MODE_DEF		0x03010301

#define SUN8I_MIXER_BLEND_CK_CTL_DEF		0x0



#define SUN8I_MIXER_BLEND_OUTCTL_INTERLACED	BIT(1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE