Unverified Commit 30d334ce authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard
Browse files

drm/sun4i: Add support for D1 mixers 



D1 has a display engine with the usual pair of mixers, albeit with
relatively few layers. In fact, D1 appears to be the first SoC to have
a mixer without any UI layers. Add support for these new variants.

Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220424162633.12369-12-samuel@sholland.org
parent b2da8192

drivers/gpu/drm/sun4i/sun8i_mixer.c

+26 −0
Original line number Diff line number Diff line
@@ -615,6 +615,24 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { 
	.mod_rate = 150000000,

};



static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {

	.ccsc		= CCSC_D1_MIXER0_LAYOUT,

	.mod_rate	= 297000000,

	.scaler_mask	= 0x3,

	.scanline_yuv	= 2048,

	.ui_num		= 1,

	.vi_num		= 1,

};



static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg = {

	.ccsc		= CCSC_MIXER1_LAYOUT,

	.mod_rate	= 297000000,

	.scaler_mask	= 0x1,

	.scanline_yuv	= 1024,

	.ui_num		= 0,

	.vi_num		= 1,

};



static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {

	.ccsc		= CCSC_MIXER0_LAYOUT,

	.mod_rate	= 297000000,
@@ -668,6 +686,14 @@ static const struct of_device_id sun8i_mixer_of_table[] = { 
		.compatible = "allwinner,sun8i-v3s-de2-mixer",

		.data = &sun8i_v3s_mixer_cfg,

	},

	{

		.compatible = "allwinner,sun20i-d1-de2-mixer-0",

		.data = &sun20i_d1_mixer0_cfg,

	},

	{

		.compatible = "allwinner,sun20i-d1-de2-mixer-1",

		.data = &sun20i_d1_mixer1_cfg,

	},

	{

		.compatible = "allwinner,sun50i-a64-de2-mixer-0",

		.data = &sun50i_a64_mixer0_cfg,