Unverified Commit 99be7118 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

drm/sun4i: csc: Rework DE3 CSC macros 



Rework DE3 CSC macros to take just one coordinate instead of two. This
will make its usage easier in subsequent commit.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210110201947.3611649-2-jernej.skrabec@siol.net
parent bb6dafdb

drivers/gpu/drm/sun4i/sun8i_csc.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void sun8i_de3_ccsc_set_coefficients(struct regmap *map, int layer, 
		return;

	}



	base_reg = SUN50I_MIXER_BLEND_CSC_COEFF(DE3_BLD_BASE, layer, 0, 0);

	base_reg = SUN50I_MIXER_BLEND_CSC_COEFF(DE3_BLD_BASE, layer, 0);

	regmap_bulk_write(map, base_reg, table, 12);

}

drivers/gpu/drm/sun4i/sun8i_mixer.h

+2 −4
Original line number Diff line number Diff line
@@ -50,10 +50,8 @@ 
#define SUN8I_MIXER_BLEND_CK_MIN(base, x)	((base) + 0xe0 + 0x04 * (x))

#define SUN8I_MIXER_BLEND_OUTCTL(base)		((base) + 0xfc)

#define SUN50I_MIXER_BLEND_CSC_CTL(base)	((base) + 0x100)

#define SUN50I_MIXER_BLEND_CSC_COEFF(base, layer, x, y) \

	((base) + 0x110 + (layer) * 0x30 +  (x) * 0x10 + 4 * (y))

#define SUN50I_MIXER_BLEND_CSC_CONST(base, layer, i) \

	((base) + 0x110 + (layer) * 0x30 +  (i) * 0x10 + 0x0c)

#define SUN50I_MIXER_BLEND_CSC_COEFF(base, layer, x) \

	((base) + 0x110 + (layer) * 0x30 +  (x) * 4)



#define SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK	GENMASK(12, 8)

#define SUN8I_MIXER_BLEND_PIPE_CTL_EN(pipe)	BIT(8 + pipe)