From: Greg Kroah-Hartman Date: Sun, 14 Aug 2022 10:39:52 +0000 (+0200) Subject: drop drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch X-Git-Tag: v5.15.61~111 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3809fbfa56891d561e4d8e0eadff69d922ba68c6;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch Breaks the build on 5.18 and 5.19 --- diff --git a/queue-4.14/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-4.14/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index 36d582125ff..00000000000 --- a/queue-4.14/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b59a36b55d0d068675ede66e8c249e61836e014c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index 0df62c9c2856..4572b978e2ad 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -405,7 +405,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 219d31136b2..bcd3d09e92d 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -70,7 +70,6 @@ media-hdpvr-fix-error-value-returns-in-hdpvr_read.patch drm-vc4-dsi-correct-dsi-divider-calculations.patch drm-rockchip-vop-don-t-crash-for-invalid-duplicate_s.patch drm-mediatek-dpi-remove-output-format-of-yuv.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch media-platform-mtk-mdp-fix-mdp_ipi_comm-structure-al.patch tcp-make-retransmitted-skb-fit-into-the-send-window.patch diff --git a/queue-4.19/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-4.19/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index 998bbf01b0e..00000000000 --- a/queue-4.19/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 48d3c16b966918333422dc324f6305670bec42e8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index 0b7cb90d2826..edd13ed1ecff 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -419,7 +419,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index e0b1887b0ce..6931184ca78 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -83,7 +83,6 @@ media-hdpvr-fix-error-value-returns-in-hdpvr_read.patch drm-vc4-dsi-correct-dsi-divider-calculations.patch drm-rockchip-vop-don-t-crash-for-invalid-duplicate_s.patch drm-mediatek-dpi-remove-output-format-of-yuv.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch drm-msm-mdp5-fix-global-state-lock-backoff.patch crypto-hisilicon-kunpeng916-crypto-driver-don-t-slee.patch diff --git a/queue-5.10/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-5.10/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index bd8891babeb..00000000000 --- a/queue-5.10/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a7ca16c9f4afcf5ef31a1f4848eb55ebb8d65d12 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index 28b33b35a30c..3d397f331f32 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -411,7 +411,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index b72023c6bf1..46c4a034c84 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -215,7 +215,6 @@ drm-rockchip-vop-don-t-crash-for-invalid-duplicate_s.patch drm-rockchip-fix-an-error-handling-path-rockchip_dp_.patch drm-mediatek-dpi-remove-output-format-of-yuv.patch drm-mediatek-dpi-only-enable-dpi-after-the-bridge-is.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch lib-bitmap-order-includes-alphabetically.patch lib-bitmap-provide-devm_bitmap_alloc-and-devm_bitmap.patch diff --git a/queue-5.15/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-5.15/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index 41383177d25..00000000000 --- a/queue-5.15/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0b08904020535e37cb28bd382161c24adf9b1f96 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index 23fb88b53324..0ec4ea447c4e 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -417,7 +417,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 8df87e4698b..710cdcd1aea 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -315,7 +315,6 @@ drm-rockchip-vop-don-t-crash-for-invalid-duplicate_s.patch drm-rockchip-fix-an-error-handling-path-rockchip_dp_.patch drm-mediatek-dpi-remove-output-format-of-yuv.patch drm-mediatek-dpi-only-enable-dpi-after-the-bridge-is.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch hinic-use-the-bitmap-api-when-applicable.patch net-hinic-fix-bug-that-ethtool-get-wrong-stats.patch diff --git a/queue-5.18/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-5.18/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index d4bd999ac7d..00000000000 --- a/queue-5.18/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 63566e5f373e76279e51d39eeed2756844a0b3d8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index 4ce0b4c41e49..4ba1a881b504 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -403,7 +403,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-5.18/series b/queue-5.18/series index 7de66786df9..99815861d8d 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -413,7 +413,6 @@ drm-rockchip-fix-an-error-handling-path-rockchip_dp_.patch drm-mediatek-dpi-remove-output-format-of-yuv.patch drm-mediatek-dpi-only-enable-dpi-after-the-bridge-is.patch drm-msm-hdmi-fill-the-pwr_regs-bulk-regulators.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch net-sched-provide-shim-definitions-for-taprio_offloa.patch net-dsa-felix-build-as-module-when-tc-taprio-is-modu.patch diff --git a/queue-5.19/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-5.19/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index 7054689e13b..00000000000 --- a/queue-5.19/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e5458c9330d4e8f602abde255205b8a5dd0b83d5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index 73070ec1a936..5000a804d2ce 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -402,7 +402,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index af2e1df8805..f60e7300100 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -438,7 +438,6 @@ drm-msm-dpu-move-intf-and-wb-assignment-to-dpu_encod.patch drm-msm-dpu-fix-maxlinewidth-for-writeback-block.patch drm-msm-dpu-remove-hard-coded-linewidth-limit-for-wr.patch drm-msm-hdmi-fill-the-pwr_regs-bulk-regulators.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch drm-msm-fix-fence-rollover-issue.patch net-sched-provide-shim-definitions-for-taprio_offloa.patch diff --git a/queue-5.4/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch b/queue-5.4/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch deleted file mode 100644 index 9bdaf60ba71..00000000000 --- a/queue-5.4/drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b441512a99e199c37beddefe9b15b65e0a165a21 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Jun 2022 15:23:43 +0300 -Subject: drm/msm/hdmi: enable core-vcc/core-vdda-supply for 8996 platform - -From: Dmitry Baryshkov - -[ Upstream commit 1f88301794595ff4c28a1f1befe690e8dbac72a2 ] - -DB820c makes use of core-vcc-supply and core-vdda-supply, however the -driver code doesn't support these regulators. Enable them for HDMI on -8996 platform. - -Fixes: 0afbe59edd3f ("drm/msm/hdmi: Add basic HDMI support for msm8996") -Signed-off-by: Dmitry Baryshkov -Reviewed-by: Stephen Boyd -Patchwork: https://patchwork.freedesktop.org/patch/488857/ -Link: https://lore.kernel.org/r/20220609122350.3157529-8-dmitry.baryshkov@linaro.org -Signed-off-by: Dmitry Baryshkov -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c -index e4c9ff934e5b..370fcc64d8a8 100644 ---- a/drivers/gpu/drm/msm/hdmi/hdmi.c -+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c -@@ -413,7 +413,7 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { - }; - - static struct hdmi_platform_config hdmi_tx_8996_config = { -- HDMI_CFG(pwr_reg, none), -+ HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 7ea8bfc9e83..945820a8882 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -118,7 +118,6 @@ drm-rockchip-vop-don-t-crash-for-invalid-duplicate_s.patch drm-rockchip-fix-an-error-handling-path-rockchip_dp_.patch drm-mediatek-dpi-remove-output-format-of-yuv.patch drm-mediatek-dpi-only-enable-dpi-after-the-bridge-is.patch -drm-msm-hdmi-enable-core-vcc-core-vdda-supply-for-89.patch drm-bridge-sii8620-fix-possible-off-by-one.patch drm-msm-mdp5-fix-global-state-lock-backoff.patch crypto-hisilicon-kunpeng916-crypto-driver-don-t-slee.patch