4.4-stable patches

added patches:
	drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.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
new file mode 100644 (file)
index 0000000..32b0862
--- /dev/null
+++ b/queue-4.4/drm-radeon-fix-fb_div-check-in-ni_init_smc_spll_table.patch
@@ -0,0 +1,33 @@
+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 49dd4d0f056dc4c75d0fed6b31ffd614f62e4bba..c38d90223d50625094b9dd544ccf1e4c84cbc9c2 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -145,3 +145,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