Drop drm-radeon-prefer-lower-feedback-dividers.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

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 c467e1f..0000000
--- a/queue-4.14/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cdc21838b5fdc9265493508402ec2f2dc64ecb38 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 5150dd85bdfa08143cacf1b4249121651bed3c35 ]
-
-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 5ccd426926d6b91386922f2eefd7e66de78d8f3f..3dcad15daa6b7da7ad25fc516c14fb2e2ff55311 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -50,7 +50,6 @@ mwifiex-do-not-use-gfp_kernel-in-atomic-context.patch
 drm-gma500-fix-error-check.patch
 scsi-qla4xxx-fix-an-error-handling-path-in-qla4xxx_g.patch
 scsi-csiostor-fix-wrong-return-value-in-csio_hw_prep.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 backlight-sky81452-backlight-fix-refcount-imbalance-.patch
 vmci-check-return-value-of-get_user_pages_fast-for-e.patch
 tty-serial-earlycon-dependency.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 5016a0b..0000000
--- a/queue-4.19/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1bafcb5df4ef285af23c2523bcbb00eb7d9ad189 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 5150dd85bdfa08143cacf1b4249121651bed3c35 ]
-
-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 3b67493dfa7a0254a68bab3676801f0ef81a5bea..e0230a0a91fb9c94aded4e894a6c1c9b6d24f3e6 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -78,7 +78,6 @@ drm-gma500-fix-error-check.patch
 scsi-qla4xxx-fix-an-error-handling-path-in-qla4xxx_g.patch
 scsi-qla2xxx-fix-wrong-return-value-in-qla_nvme_regi.patch
 scsi-csiostor-fix-wrong-return-value-in-csio_hw_prep.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 backlight-sky81452-backlight-fix-refcount-imbalance-.patch
 vmci-check-return-value-of-get_user_pages_fast-for-e.patch
 tty-serial-earlycon-dependency.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 fdfb013..0000000
--- a/queue-4.9/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 966a752cd5e0d8377aa83493cfa1163853a65eec 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 5150dd85bdfa08143cacf1b4249121651bed3c35 ]
-
-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 e27d9f814993b53e701a7fcc870ffd60269379ab..177c9e8fb87c1915f9aef081c08c4e45b531724e 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -31,7 +31,6 @@ mwifiex-do-not-use-gfp_kernel-in-atomic-context.patch
 drm-gma500-fix-error-check.patch
 scsi-qla4xxx-fix-an-error-handling-path-in-qla4xxx_g.patch
 scsi-csiostor-fix-wrong-return-value-in-csio_hw_prep.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 backlight-sky81452-backlight-fix-refcount-imbalance-.patch
 vmci-check-return-value-of-get_user_pages_fast-for-e.patch
 tty-serial-earlycon-dependency.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 3a81e92..0000000
--- a/queue-5.4/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1ce0faed7f388cf195457e3675d17444563d11db 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 5150dd85bdfa08143cacf1b4249121651bed3c35 ]
-
-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 cf7a3fd907114cd1903bd67bf61797ef58b6f6bd..949ad01503d64fa9596dca8c174d95e168323a19 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -119,7 +119,6 @@ scsi-qla4xxx-fix-an-error-handling-path-in-qla4xxx_g.patch
 scsi-qla2xxx-fix-wrong-return-value-in-qlt_chk_unres.patch
 scsi-qla2xxx-fix-wrong-return-value-in-qla_nvme_regi.patch
 scsi-csiostor-fix-wrong-return-value-in-csio_hw_prep.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 backlight-sky81452-backlight-fix-refcount-imbalance-.patch
 staging-emxx_udc-fix-passing-of-null-to-dma_alloc_co.patch
 vmci-check-return-value-of-get_user_pages_fast-for-e.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 06a5025..0000000
--- a/queue-5.8/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From fa094c12465f76bc87546234215bb5d62a0ee03e 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 5150dd85bdfa08143cacf1b4249121651bed3c35 ]
-
-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 e27614ab2ea04e26bab67e1b2a93c9672f6d9eec..f5c725a238148d70ff488fd988ee553c9439512f 100644 (file)
--- a/queue-5.8/series
+++ b/queue-5.8/series
@@ -180,7 +180,6 @@ libbpf-fix-unintentional-success-return-code-in-bpf_.patch
 wilc1000-fix-memleak-in-wilc_sdio_probe.patch
 wilc1000-fix-memleak-in-wilc_bus_probe.patch
 rtw88-don-t-treat-null-pointer-as-an-array.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 backlight-sky81452-backlight-fix-refcount-imbalance-.patch
 staging-emxx_udc-fix-passing-of-null-to-dma_alloc_co.patch
 vmci-check-return-value-of-get_user_pages_fast-for-e.patch

diff --git a/queue-5.9/drm-radeon-prefer-lower-feedback-dividers.patch b/queue-5.9/drm-radeon-prefer-lower-feedback-dividers.patch
deleted file mode 100644 (file)
index dd9a7b6..0000000
--- a/queue-5.9/drm-radeon-prefer-lower-feedback-dividers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3fa04dfbb55a95e7c6075d0644f64bcb6e7f4ef8 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 5150dd85bdfa08143cacf1b4249121651bed3c35 ]
-
-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 e0ae911ef427d..7b69d6dfe44a3 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.9/series b/queue-5.9/series
index 82c56b87c7031a03ebdb1978a4386059bbf00c05..6c247831dce224e89affa51f04f5ab06ebe76bf3 100644 (file)
--- a/queue-5.9/series
+++ b/queue-5.9/series
@@ -211,7 +211,6 @@ wilc1000-fix-memleak-in-wilc_sdio_probe.patch
 wilc1000-fix-memleak-in-wilc_bus_probe.patch
 rtw88-don-t-treat-null-pointer-as-an-array.patch
 selftests-livepatch-do-not-check-order-when-using-co.patch
-drm-radeon-prefer-lower-feedback-dividers.patch
 backlight-sky81452-backlight-fix-refcount-imbalance-.patch
 staging-wfx-fix-frame-reordering.patch
 staging-emxx_udc-fix-passing-of-null-to-dma_alloc_co.patch