From d0a1fd83c8795bc09620f950be41a0525d1bfcdc Mon Sep 17 00:00:00 2001 From: Karabek Date: Thu, 31 May 2018 14:19:45 +0200 Subject: [PATCH] replaced by general-add-H3-mixer1.patch mixer0 has been added upstream, "general-add-H3-mixer1.patch" adds mixer1 --- .../unresolved/02-add-H3-mixers.patch | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 patch/kernel/sunxi-dev/unresolved/02-add-H3-mixers.patch diff --git a/patch/kernel/sunxi-dev/unresolved/02-add-H3-mixers.patch b/patch/kernel/sunxi-dev/unresolved/02-add-H3-mixers.patch deleted file mode 100644 index 80372b811..000000000 --- a/patch/kernel/sunxi-dev/unresolved/02-add-H3-mixers.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cf9c6a1a49beecea35f395017a0e3aa9d97f2f17 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Tue, 1 Aug 2017 21:12:53 +0800 -Subject: [PATCH] drm: sun4i: add support for H3 mixers - -Allwinner H3 SoC has two mixers, one has 1 VI channel and 3 UI channels, -and the other has 1 VI and 1 UI. There's also some graphics post-process -function that is missing on mixer1, however, as we currently support -none of these functions, the only difference that is shown to us is the -channel number difference. - -Add support for these two variants. - -Signed-off-by: Icenowy Zheng ---- - drivers/gpu/drm/sun4i/sun8i_mixer.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c -index cb193c5f16862..d658a3a8159a7 100644 ---- a/drivers/gpu/drm/sun4i/sun8i_mixer.c -+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c -@@ -390,11 +390,29 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { - .ui_num = 1, - }; - -+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { -+ .vi_num = 1, -+ .ui_num = 3, -+}; -+ -+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = { -+ .vi_num = 1, -+ .ui_num = 1, -+}; -+ - static const struct of_device_id sun8i_mixer_of_table[] = { - { - .compatible = "allwinner,sun8i-v3s-de2-mixer", - .data = &sun8i_v3s_mixer_cfg, - }, -+ { -+ .compatible = "allwinner,sun8i-h3-de2-mixer0", -+ .data = &sun8i_h3_mixer0_cfg -+ }, -+ { -+ .compatible = "allwinner,sun8i-h3-de2-mixer1", -+ .data = &sun8i_h3_mixer1_cfg -+ }, - { } - }; - MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);