aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJernej Skrabec <jernej.skrabec@siol.net>2018-02-14 15:09:03 -0500
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-02-16 03:35:32 -0500
commit47095e1635aa17a94bb1decdba3de1e21955d379 (patch)
tree97f86ed92c8e7316e3e503d3810c488ffd669556
parent05adc89b69eaeef48d4333e8cb5c89c7bb469512 (diff)
drm/sun4i: Add support for A83T second DE2 mixer
It supports 1 VI and 1 UI plane and HW scaling on both planes. Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180214200906.31509-10-jernej.skrabec@siol.net
-rw-r--r--drivers/gpu/drm/sun4i/sun8i_mixer.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 2cbb2de6d39c..9b0256d31a61 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -485,6 +485,13 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {
485 .vi_num = 1, 485 .vi_num = 1,
486}; 486};
487 487
488static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
489 .ccsc = 1,
490 .scaler_mask = 0x3,
491 .ui_num = 1,
492 .vi_num = 1,
493};
494
488static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { 495static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
489 .vi_num = 2, 496 .vi_num = 2,
490 .ui_num = 1, 497 .ui_num = 1,
@@ -499,6 +506,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
499 .data = &sun8i_a83t_mixer0_cfg, 506 .data = &sun8i_a83t_mixer0_cfg,
500 }, 507 },
501 { 508 {
509 .compatible = "allwinner,sun8i-a83t-de2-mixer-1",
510 .data = &sun8i_a83t_mixer1_cfg,
511 },
512 {
502 .compatible = "allwinner,sun8i-v3s-de2-mixer", 513 .compatible = "allwinner,sun8i-v3s-de2-mixer",
503 .data = &sun8i_v3s_mixer_cfg, 514 .data = &sun8i_v3s_mixer_cfg,
504 }, 515 },