Unverified Commit 2586de70 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

drm/sun4i: Add VI scaler line size quirk for DE2/DE3 



While all RGB scalers have maximum line size of 2048, some YUV scalers
have maximum line size of 2048 and some have line size of 4096.

Since there is no rule for that, add a quirk.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190228200329.11128-3-jernej.skrabec@siol.net
parent c825dc23

drivers/gpu/drm/sun4i/sun8i_mixer.c

+9 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static int sun8i_mixer_remove(struct platform_device *pdev) 
static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {

	.ccsc		= 0,

	.scaler_mask	= 0xf,

	.scanline_yuv	= 2048,

	.ui_num		= 3,

	.vi_num		= 1,

};
@@ -561,6 +562,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = { 
static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {

	.ccsc		= 1,

	.scaler_mask	= 0x3,

	.scanline_yuv	= 2048,

	.ui_num		= 1,

	.vi_num		= 1,

};
@@ -569,6 +571,7 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { 
	.ccsc		= 0,

	.mod_rate	= 432000000,

	.scaler_mask	= 0xf,

	.scanline_yuv	= 2048,

	.ui_num		= 3,

	.vi_num		= 1,

};
@@ -577,6 +580,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = { 
	.ccsc		= 0,

	.mod_rate	= 297000000,

	.scaler_mask	= 0xf,

	.scanline_yuv	= 2048,

	.ui_num		= 3,

	.vi_num		= 1,

};
@@ -585,6 +589,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = { 
	.ccsc		= 1,

	.mod_rate	= 297000000,

	.scaler_mask	= 0x3,

	.scanline_yuv	= 2048,

	.ui_num		= 1,

	.vi_num		= 1,

};
@@ -593,6 +598,7 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { 
	.vi_num = 2,

	.ui_num = 1,

	.scaler_mask = 0x3,

	.scanline_yuv = 2048,

	.ccsc = 0,

	.mod_rate = 150000000,

};
@@ -601,6 +607,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = { 
	.ccsc		= 0,

	.mod_rate	= 297000000,

	.scaler_mask	= 0xf,

	.scanline_yuv	= 4096,

	.ui_num		= 3,

	.vi_num		= 1,

};
@@ -609,6 +616,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = { 
	.ccsc		= 1,

	.mod_rate	= 297000000,

	.scaler_mask	= 0x3,

	.scanline_yuv	= 2048,

	.ui_num		= 1,

	.vi_num		= 1,

};
@@ -618,6 +626,7 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = { 
	.is_de3		= true,

	.mod_rate	= 600000000,

	.scaler_mask	= 0xf,

	.scanline_yuv	= 4096,

	.ui_num		= 3,

	.vi_num		= 1,

};

drivers/gpu/drm/sun4i/sun8i_mixer.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ struct de2_fmt_info { 
 * @mod_rate: module clock rate that needs to be set in order to have

 *	a functional block.

 * @is_de3: true, if this is next gen display engine 3.0, false otherwise.

 * @scaline_yuv: size of a scanline for VI scaler for YUV formats.

 */

struct sun8i_mixer_cfg {

	int		vi_num;
@@ -167,6 +168,7 @@ struct sun8i_mixer_cfg { 
	int		ccsc;

	unsigned long	mod_rate;

	unsigned int	is_de3 : 1;

	unsigned int	scanline_yuv;

};



struct sun8i_mixer {

CRA Git | Maintained and supported by SUSTech CRA and CCSE