Commit 2f4cffe4 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

drm/sun4i: Explain color macro in DE2 driver 



Color attribute have same format troughout the whole driver.

Rename macro, add comment with simple explanation and remove redundant
definitions.

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-7-jernej.skrabec@siol.net
parent 7f11f1da

drivers/gpu/drm/sun4i/sun8i_mixer.c

+5 −3
Original line number Diff line number Diff line
@@ -317,17 +317,19 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, 
	regmap_write(mixer->engine.regs, SUN8I_MIXER_GLOBAL_CTL,

		     SUN8I_MIXER_GLOBAL_CTL_RT_EN);



	/* Set background color to black */

	regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_BKCOLOR,

		     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_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_ATTR_FCOLOR(0),

		     SUN8I_MIXER_BLEND_ATTR_FCOLOR_DEF);

		     SUN8I_MIXER_BLEND_COLOR_BLACK);



	/* Select the first UI channel */

	DRM_DEBUG_DRIVER("Selecting channel %d (first UI channel)\n",

drivers/gpu/drm/sun4i/sun8i_mixer.h

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ 
#define SUN8I_MIXER_BLEND_CK_MIN(x)		(0x10e0 + 0x04 * (x))

#define SUN8I_MIXER_BLEND_OUTCTL		0x10fc



/* 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_ATTR_FCOLOR_DEF	0xff000000

#define SUN8I_MIXER_BLEND_FCOLOR_CTL_DEF	0x00000101

#define SUN8I_MIXER_BLEND_BKCOLOR_DEF		0xff000000

#define SUN8I_MIXER_BLEND_MODE_DEF		0x03010301



#define SUN8I_MIXER_BLEND_OUTCTL_INTERLACED	BIT(1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE