Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220424162633.12369-12-samuel@sholland.org

authored by

Samuel Holland and committed by
Maxime Ripard
30d334ce b2da8192

+26
+26
drivers/gpu/drm/sun4i/sun8i_mixer.c
··· 615 615 .mod_rate = 150000000, 616 616 }; 617 617 618 + static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = { 619 + .ccsc = CCSC_D1_MIXER0_LAYOUT, 620 + .mod_rate = 297000000, 621 + .scaler_mask = 0x3, 622 + .scanline_yuv = 2048, 623 + .ui_num = 1, 624 + .vi_num = 1, 625 + }; 626 + 627 + static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg = { 628 + .ccsc = CCSC_MIXER1_LAYOUT, 629 + .mod_rate = 297000000, 630 + .scaler_mask = 0x1, 631 + .scanline_yuv = 1024, 632 + .ui_num = 0, 633 + .vi_num = 1, 634 + }; 635 + 618 636 static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = { 619 637 .ccsc = CCSC_MIXER0_LAYOUT, 620 638 .mod_rate = 297000000, ··· 685 667 { 686 668 .compatible = "allwinner,sun8i-v3s-de2-mixer", 687 669 .data = &sun8i_v3s_mixer_cfg, 670 + }, 671 + { 672 + .compatible = "allwinner,sun20i-d1-de2-mixer-0", 673 + .data = &sun20i_d1_mixer0_cfg, 674 + }, 675 + { 676 + .compatible = "allwinner,sun20i-d1-de2-mixer-1", 677 + .data = &sun20i_d1_mixer1_cfg, 688 678 }, 689 679 { 690 680 .compatible = "allwinner,sun50i-a64-de2-mixer-0",