drop drm-radeon-prefer-lower-feedback-dividers.patch from everywhere

diff --git a/queue-4.14/drm-radeon-prefer-lower-feedback-dividers.patch b/queue-4.14/drm-radeon-prefer-lower-feedback-dividers.patch
deleted file mode 100644 (file)
index 9cc614f..0000000
--- a/queue-4.14/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f0017149b95cf85490795cd32e7f5d071c35b8f4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 26 Aug 2020 01:33:48 +0800
-Subject: drm/radeon: Prefer lower feedback dividers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-
-[ Upstream commit fc8c70526bd30733ea8667adb8b8ffebea30a8ed ]
-
-Commit 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-fixed screen flicker for HP Compaq nx9420 but breaks other laptops like
-Asus X50SL.
-
-Turns out we also need to favor lower feedback dividers.
-
-Users confirmed this change fixes the regression and doesn't regress the
-original fix.
-
-Fixes: 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-BugLink: https://bugs.launchpad.net/bugs/1791312
-BugLink: https://bugs.launchpad.net/bugs/1861554
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/radeon/radeon_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index b2334349799d1..f1de68340944b 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -928,7 +928,7 @@ static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div,
- 
-       /* get matching reference and feedback divider */
-       *ref_div = min(max(den/post_div, 1u), ref_div_max);
--      *fb_div = DIV_ROUND_CLOSEST(nom * *ref_div * post_div, den);
-+      *fb_div = max(nom * *ref_div * post_div / den, 1u);
- 
-       /* limit fb divider to its maximum */
-       if (*fb_div > fb_div_max) {
--- 
-2.25.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index e0af25ed5520ce462a5d0a884a1f0ee5bc7732b1..550e11fa47dfb839d12165898ca629f2b41733e0 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -30,7 +30,6 @@ nvmet-fc-fix-a-missed-_irqsave-version-of-spin_lock-.patch
 perf-tools-correct-snoopx-field-offset.patch
 net-ethernet-mlx4-fix-memory-allocation-in-mlx4_budd.patch
 fix-regression-in-epoll-keep-a-reference-on-files-ad.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 tg3-fix-soft-lockup-when-tg3_reset_task-fails.patch
 iommu-vt-d-serialize-iommu-gcmd-register-modificatio.patch
 thermal-ti-soc-thermal-fix-bogus-thermal-shutdowns-f.patch

diff --git a/queue-4.19/drm-radeon-prefer-lower-feedback-dividers.patch b/queue-4.19/drm-radeon-prefer-lower-feedback-dividers.patch
deleted file mode 100644 (file)
index 1fe7729..0000000
--- a/queue-4.19/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e1ef8462b49963180ae5f167f1ede01066ba72be Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 26 Aug 2020 01:33:48 +0800
-Subject: drm/radeon: Prefer lower feedback dividers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-
-[ Upstream commit fc8c70526bd30733ea8667adb8b8ffebea30a8ed ]
-
-Commit 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-fixed screen flicker for HP Compaq nx9420 but breaks other laptops like
-Asus X50SL.
-
-Turns out we also need to favor lower feedback dividers.
-
-Users confirmed this change fixes the regression and doesn't regress the
-original fix.
-
-Fixes: 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-BugLink: https://bugs.launchpad.net/bugs/1791312
-BugLink: https://bugs.launchpad.net/bugs/1861554
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/radeon/radeon_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 3f0f3a578ddf0..c28d76d898fdb 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -926,7 +926,7 @@ static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div,
- 
-       /* get matching reference and feedback divider */
-       *ref_div = min(max(den/post_div, 1u), ref_div_max);
--      *fb_div = DIV_ROUND_CLOSEST(nom * *ref_div * post_div, den);
-+      *fb_div = max(nom * *ref_div * post_div / den, 1u);
- 
-       /* limit fb divider to its maximum */
-       if (*fb_div > fb_div_max) {
--- 
-2.25.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 404dc32703871f967ce0908d2bf564ee7e61d3c1..7bcaa898a127318d0b50b1f1ef3b8d49e35337fd 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -41,7 +41,6 @@ perf-tools-correct-snoopx-field-offset.patch
 net-ethernet-mlx4-fix-memory-allocation-in-mlx4_budd.patch
 fix-regression-in-epoll-keep-a-reference-on-files-ad.patch
 net-gemini-fix-another-missing-clk_disable_unprepare.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 xfs-fix-xfs_bmap_validate_extent_raw-when-checking-a.patch
 perf-jevents-fix-suspicious-code-in-fixregex.patch
 tg3-fix-soft-lockup-when-tg3_reset_task-fails.patch

diff --git a/queue-4.9/drm-radeon-prefer-lower-feedback-dividers.patch b/queue-4.9/drm-radeon-prefer-lower-feedback-dividers.patch
deleted file mode 100644 (file)
index d3a97fb..0000000
--- a/queue-4.9/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6069c5e1f428b413dde1c4753bf30a77f4992638 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 26 Aug 2020 01:33:48 +0800
-Subject: drm/radeon: Prefer lower feedback dividers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-
-[ Upstream commit fc8c70526bd30733ea8667adb8b8ffebea30a8ed ]
-
-Commit 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-fixed screen flicker for HP Compaq nx9420 but breaks other laptops like
-Asus X50SL.
-
-Turns out we also need to favor lower feedback dividers.
-
-Users confirmed this change fixes the regression and doesn't regress the
-original fix.
-
-Fixes: 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-BugLink: https://bugs.launchpad.net/bugs/1791312
-BugLink: https://bugs.launchpad.net/bugs/1861554
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/radeon/radeon_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 99e23800cadc7..3fcccd0b99aff 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -940,7 +940,7 @@ static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div,
- 
-       /* get matching reference and feedback divider */
-       *ref_div = min(max(den/post_div, 1u), ref_div_max);
--      *fb_div = DIV_ROUND_CLOSEST(nom * *ref_div * post_div, den);
-+      *fb_div = max(nom * *ref_div * post_div / den, 1u);
- 
-       /* limit fb divider to its maximum */
-       if (*fb_div > fb_div_max) {
--- 
-2.25.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 1bfc02f3e6da5114b19797df210ff3be09d3cf05..8196ec9eb9ce0fa132132fe776e03b6b92bc5623 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -22,7 +22,6 @@ dmaengine-pl330-fix-burst-length-if-burst-size-is-sm.patch
 bnxt_en-check-for-zero-dir-entries-in-nvram.patch
 bnxt_en-fix-pci-aer-error-recovery-flow.patch
 fix-regression-in-epoll-keep-a-reference-on-files-ad.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 tg3-fix-soft-lockup-when-tg3_reset_task-fails.patch
 iommu-vt-d-serialize-iommu-gcmd-register-modificatio.patch
 thermal-ti-soc-thermal-fix-bogus-thermal-shutdowns-f.patch

diff --git a/queue-5.4/drm-radeon-prefer-lower-feedback-dividers.patch b/queue-5.4/drm-radeon-prefer-lower-feedback-dividers.patch
deleted file mode 100644 (file)
index 6e6bb3a..0000000
--- a/queue-5.4/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7abad39f34f506b0e75391e3c3dc430ec97bf3d7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 26 Aug 2020 01:33:48 +0800
-Subject: drm/radeon: Prefer lower feedback dividers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-
-[ Upstream commit fc8c70526bd30733ea8667adb8b8ffebea30a8ed ]
-
-Commit 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-fixed screen flicker for HP Compaq nx9420 but breaks other laptops like
-Asus X50SL.
-
-Turns out we also need to favor lower feedback dividers.
-
-Users confirmed this change fixes the regression and doesn't regress the
-original fix.
-
-Fixes: 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-BugLink: https://bugs.launchpad.net/bugs/1791312
-BugLink: https://bugs.launchpad.net/bugs/1861554
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/radeon/radeon_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index f9f74150d0d73..e7c4e06bc7d4f 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -932,7 +932,7 @@ static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div,
- 
-       /* get matching reference and feedback divider */
-       *ref_div = min(max(den/post_div, 1u), ref_div_max);
--      *fb_div = DIV_ROUND_CLOSEST(nom * *ref_div * post_div, den);
-+      *fb_div = max(nom * *ref_div * post_div / den, 1u);
- 
-       /* limit fb divider to its maximum */
-       if (*fb_div > fb_div_max) {
--- 
-2.25.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 51e5a524a58120614e6b92f1766934cc8e07d86a..781d8043454eda99d98b2590bec2cf007eb9b16f 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -58,7 +58,6 @@ perf-tools-correct-snoopx-field-offset.patch
 net-ethernet-mlx4-fix-memory-allocation-in-mlx4_budd.patch
 fix-regression-in-epoll-keep-a-reference-on-files-ad.patch
 net-gemini-fix-another-missing-clk_disable_unprepare.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 mips-add-missing-msacsr-and-upper-msa-initialization.patch
 xfs-fix-xfs_bmap_validate_extent_raw-when-checking-a.patch
 perf-jevents-fix-suspicious-code-in-fixregex.patch

diff --git a/queue-5.8/drm-radeon-prefer-lower-feedback-dividers.patch b/queue-5.8/drm-radeon-prefer-lower-feedback-dividers.patch
deleted file mode 100644 (file)
index b2e91cf..0000000
--- a/queue-5.8/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0e7759caa543b3f22e494f5991ad005f516d8a0b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 26 Aug 2020 01:33:48 +0800
-Subject: drm/radeon: Prefer lower feedback dividers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-
-[ Upstream commit fc8c70526bd30733ea8667adb8b8ffebea30a8ed ]
-
-Commit 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-fixed screen flicker for HP Compaq nx9420 but breaks other laptops like
-Asus X50SL.
-
-Turns out we also need to favor lower feedback dividers.
-
-Users confirmed this change fixes the regression and doesn't regress the
-original fix.
-
-Fixes: 2e26ccb119bd ("drm/radeon: prefer lower reference dividers")
-BugLink: https://bugs.launchpad.net/bugs/1791312
-BugLink: https://bugs.launchpad.net/bugs/1861554
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/radeon/radeon_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index df1a7eb736517..840c4bf6307fd 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -933,7 +933,7 @@ static void avivo_get_fb_ref_div(unsigned nom, unsigned den, unsigned post_div,
- 
-       /* get matching reference and feedback divider */
-       *ref_div = min(max(den/post_div, 1u), ref_div_max);
--      *fb_div = DIV_ROUND_CLOSEST(nom * *ref_div * post_div, den);
-+      *fb_div = max(nom * *ref_div * post_div / den, 1u);
- 
-       /* limit fb divider to its maximum */
-       if (*fb_div > fb_div_max) {
--- 
-2.25.1
-

diff --git a/queue-5.8/series b/queue-5.8/series
index cd32193ec7c5d98bca3bd31494e6402c5fc30d5b..9d18dfda220a3dc870b97275b9a5d95cd4feabf5 100644 (file)
--- a/queue-5.8/series
+++ b/queue-5.8/series
@@ -98,7 +98,6 @@ net-bcmgenet-fix-mask-check-in-bcmgenet_validate_flo.patch
 net-gemini-fix-another-missing-clk_disable_unprepare.patch
 nfp-flower-fix-abi-mismatch-between-driver-and-firmw.patch
 net-dp83867-fix-wol-secureon-password.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 mips-add-missing-msacsr-and-upper-msa-initialization.patch
 mips-sni-fix-scsi-interrupt.patch
 xfs-fix-xfs_bmap_validate_extent_raw-when-checking-a.patch