From: Sasha Levin Date: Mon, 26 Oct 2020 14:39:05 +0000 (-0400) Subject: Drop drm-radeon-prefer-lower-feedback-dividers.patch X-Git-Tag: v4.4.241~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dee5412f48077ae6d6b4e2a7461366f6c667ae9;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-radeon-prefer-lower-feedback-dividers.patch Signed-off-by: Sasha Levin --- 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 index c467e1fbcfa..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Kai-Heng Feng -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 5ccd426926d..3dcad15daa6 100644 --- 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 index 5016a0b7905..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Kai-Heng Feng -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 3b67493dfa7..e0230a0a91f 100644 --- 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 index fdfb013f2c3..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Kai-Heng Feng -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 e27d9f81499..177c9e8fb87 100644 --- 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 index 3a81e9213b6..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Kai-Heng Feng -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 cf7a3fd9071..949ad01503d 100644 --- 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 index 06a5025071e..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Kai-Heng Feng -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 e27614ab2ea..f5c725a2381 100644 --- 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 index dd9a7b64165..00000000000 --- 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 -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 - -[ 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 -Signed-off-by: Kai-Heng Feng -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 82c56b87c70..6c247831dce 100644 --- 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