drop drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch from everywhere

And queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch

diff --git a/queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch b/queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch
deleted file mode 100644 (file)
index 2af03f6..0000000
--- a/queue-4.14/arm64-dts-marvell-espressobin-add-ethernet-alias.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5253cb8c00a6f4356760efb38bca0e0393aa06de Mon Sep 17 00:00:00 2001
-From: Tomasz Maciej Nowak <tmn505@gmail.com>
-Date: Thu, 27 Feb 2020 17:52:32 +0100
-Subject: arm64: dts: marvell: espressobin: add ethernet alias
-
-From: Tomasz Maciej Nowak <tmn505@gmail.com>
-
-commit 5253cb8c00a6f4356760efb38bca0e0393aa06de upstream.
-
-The maker of this board and its variants, stores MAC address in U-Boot
-environment. Add alias for bootloader to recognise, to which ethernet
-node inject the factory MAC address.
-
-Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
-Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
-[pali: Backported to 5.4 and older versions]
-Signed-off-by: Pali Rohár <pali@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-@@ -52,6 +52,12 @@
-       model = "Globalscale Marvell ESPRESSOBin Board";
-       compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
- 
-+      aliases {
-+              ethernet0 = &eth0;
-+              serial0 = &uart0;
-+              serial1 = &uart1;
-+      };
-+
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };

diff --git a/queue-4.14/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-4.14/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 8ab4b61..0000000
--- a/queue-4.14/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2123,7 +2123,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-4.14/series b/queue-4.14/series
index c7c06ce1ba2811e43c629b4e570e9d236bfc5915..510da1f12e53d136f2e2ad8d8dcf641d45920238 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -220,8 +220,6 @@ sh-landisk-add-missing-initialization-of-sh_io_port_.patch
 khugepaged-retract_page_tables-remember-to-test-exit.patch
 genirq-affinity-handle-affinity-setting-on-inactive-interrupts-correctly.patch
 genirq-affinity-make-affinity-setting-if-activated-opt-in.patch
-arm64-dts-marvell-espressobin-add-ethernet-alias.patch
 dm-cache-pass-cache-structure-to-mode-functions.patch
 dm-cache-submit-writethrough-writes-in-parallel-to-origin-and-cache.patch
 dm-cache-remove-all-obsolete-writethrough-specific-code.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch

diff --git a/queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 8ab4b61..0000000
--- a/queue-4.19/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2123,7 +2123,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-4.19/series b/queue-4.19/series
index faba21d881ccd28b9f6406d5bf7418f5ceefe9d0..2e9bc3b9cdf8ed4718b5d8530a21ca458f0acfab 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -86,6 +86,5 @@ tools-build-feature-quote-cc-and-cxx-for-their-argum.patch
 sh-landisk-add-missing-initialization-of-sh_io_port_.patch
 khugepaged-retract_page_tables-remember-to-test-exit.patch
 arm64-dts-marvell-espressobin-add-ethernet-alias.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
 drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch
 drm-amdgpu-fix-bug-where-dpm-is-not-enabled-after-hibernate-and-resume.patch

diff --git a/queue-4.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-4.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 32b0862..0000000
--- a/queue-4.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2125,7 +2125,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-4.4/series b/queue-4.4/series
index abfd6bcc3d0b57c448a2f2cfa4951c76f7d6700d..484c18f74297ec0996d8fc0b356f815bd7e5579c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -144,5 +144,4 @@ fs-ufs-avoid-potential-u32-multiplication-overflow.patch
 mfd-dln2-run-event-handler-loop-under-spinlock.patch
 alsa-echoaudio-fix-potential-oops-in-snd_echo_resume.patch
 sh-landisk-add-missing-initialization-of-sh_io_port_.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
 ipv6-check-skb-protocol-before-lookup-for-nexthop.patch

diff --git a/queue-4.9/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-4.9/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 8ab4b61..0000000
--- a/queue-4.9/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2123,7 +2123,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-4.9/series b/queue-4.9/series
index 7a91eba103b6c16ce49d3a1881afccae7e6df798..22ce47492a4d77e5644fb081c8b9e1fa90b090d7 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -208,4 +208,3 @@ alsa-echoaudio-fix-potential-oops-in-snd_echo_resume.patch
 sh-landisk-add-missing-initialization-of-sh_io_port_.patch
 khugepaged-retract_page_tables-remember-to-test-exit.patch
 mm-avoid-calling-build_all_zonelists_init-under-hotplug-context.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch

diff --git a/queue-5.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-5.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 32b0862..0000000
--- a/queue-5.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2125,7 +2125,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-5.4/series b/queue-5.4/series
index 6db35546b66119633ab7a5900676d58d700aedb8..3048d4354667d08e868cef2ef5345912932fa906 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -143,7 +143,6 @@ perf-x86-rapl-fix-missing-psys-sysfs-attributes.patch
 sh-landisk-add-missing-initialization-of-sh_io_port_.patch
 khugepaged-retract_page_tables-remember-to-test-exit.patch
 arm64-dts-marvell-espressobin-add-ethernet-alias.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
 drm-panfrost-use-kvfree-to-free-bo-sgts.patch
 drm-added-orientation-quirk-for-asus-tablet-model-t103haf.patch
 drm-fix-drm_dp_mst_port-refcount-leaks-in-drm_dp_mst_allocate_vcpi.patch

diff --git a/queue-5.7/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-5.7/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 1f9fa7a..0000000
--- a/queue-5.7/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2124,7 +2124,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-5.7/series b/queue-5.7/series
index dbfb2ed38ec47d1514e5b689a19a66ea846252a6..43e7490677bdebf557524cccf3b34ff3ed333846 100644 (file)
--- a/queue-5.7/series
+++ b/queue-5.7/series
@@ -189,7 +189,6 @@ khugepaged-retract_page_tables-remember-to-test-exit.patch
 asoc-tegra-use-device-managed-resource-apis-to-get-the-clock.patch
 asoc-tegra-add-audio-mclk-parent-configuration.patch
 asoc-tegra-enable-audio-mclk-during-tegra_asoc_utils_init.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
 drm-i915-gt-force-the-gt-reset-on-shutdown.patch
 drm-panfrost-use-kvfree-to-free-bo-sgts.patch
 drm-dp_mst-fix-the-ddc-i2c-device-registration-of-an-mst-port.patch

diff --git a/queue-5.8/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch b/queue-5.8/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
deleted file mode 100644 (file)
index 1f9fa7a..0000000
--- a/queue-5.8/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f29aa08852e1953e461f2d47ab13c34e14bc08b3 Mon Sep 17 00:00:00 2001
-From: Denis Efremov <efremov@linux.com>
-Date: Mon, 22 Jun 2020 23:31:22 +0300
-Subject: drm/radeon: fix fb_div check in ni_init_smc_spll_table()
-
-From: Denis Efremov <efremov@linux.com>
-
-commit f29aa08852e1953e461f2d47ab13c34e14bc08b3 upstream.
-
-clk_s is checked twice in a row in ni_init_smc_spll_table().
-fb_div should be checked instead.
-
-Fixes: 69e0b57a91ad ("drm/radeon/kms: add dpm support for cayman (v5)")
-Cc: stable@vger.kernel.org
-Signed-off-by: Denis Efremov <efremov@linux.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/radeon/ni_dpm.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/radeon/ni_dpm.c
-+++ b/drivers/gpu/drm/radeon/ni_dpm.c
-@@ -2124,7 +2124,7 @@ static int ni_init_smc_spll_table(struct
-               if (p_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_PDIV_SHIFT))
-                       ret = -EINVAL;
- 
--              if (clk_s & ~(SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_CLKS_SHIFT))
-+              if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))
-                       ret = -EINVAL;
- 
-               if (fb_div & ~(SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_MASK >> SMC_NISLANDS_SPLL_DIV_TABLE_FBDIV_SHIFT))

diff --git a/queue-5.8/series b/queue-5.8/series
index be9e6d1f4bc751d2e100413ec868c6d7f5d5e50a..2b5c3533bb3bf85d97a37d3bb62856c4cc0efaf0 100644 (file)
--- a/queue-5.8/series
+++ b/queue-5.8/series
@@ -215,7 +215,6 @@ tools-build-feature-quote-cc-and-cxx-for-their-argum.patch
 perf-x86-rapl-fix-missing-psys-sysfs-attributes.patch
 sh-landisk-add-missing-initialization-of-sh_io_port_.patch
 sh-fault-fix-duplicate-printing-of-pc.patch
-drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
 drm-i915-gt-force-the-gt-reset-on-shutdown.patch
 drm-panfrost-use-kvfree-to-free-bo-sgts.patch
 drm-dp_mst-fix-the-ddc-i2c-device-registration-of-an-mst-port.patch