From: Greg Kroah-Hartman Date: Wed, 8 Jun 2022 11:50:41 +0000 (+0200) Subject: drop media-rkvdec-stop-overclocking-the-decoder.patch from everywhere X-Git-Tag: v5.10.121~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1259704f10a1bfb2ef247c253ff27fe1af862022;p=thirdparty%2Fkernel%2Fstable-queue.git drop media-rkvdec-stop-overclocking-the-decoder.patch from everywhere --- diff --git a/queue-5.10/media-rkvdec-stop-overclocking-the-decoder.patch b/queue-5.10/media-rkvdec-stop-overclocking-the-decoder.patch deleted file mode 100644 index 0a18d44b09a..00000000000 --- a/queue-5.10/media-rkvdec-stop-overclocking-the-decoder.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5317f65437605a831076706846a29636ac113575 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 13 May 2022 22:29:10 +0200 -Subject: media: rkvdec: Stop overclocking the decoder - -From: Nicolas Dufresne - -[ Upstream commit 9998943f6dfc5d5472bfab2e38527fb6ba5e9da7 ] - -While this overclock hack seems to work on some implementations -(some ChromeBooks, RockPi4) it also causes instability on other -implementations (notably LibreComputer Renegade, but there were more -reports in the LibreELEC project, where this has been removed). While -performance is indeed affected (tested with GStreamer), 4K playback -still works as long as you don't operate in lock step and keep at -least 1 frame ahead of time in the decode queue. - -After discussion with ChromeOS members, it would seem that their -implementation indeed used to synchronously decode each frame, so -this hack was simply compensating for their code being less -efficient. In my opinion, this hack should not have been included -upstream. - -Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver") -Signed-off-by: Nicolas Dufresne -Reviewed-by: Sebastian Fricke -Reviewed-by: Ezequiel Garcia -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/staging/media/rkvdec/rkvdec.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index e384ea8d7280..617d06b8f597 100644 ---- a/drivers/staging/media/rkvdec/rkvdec.c -+++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -1025,12 +1025,6 @@ static int rkvdec_probe(struct platform_device *pdev) - if (ret) - return ret; - -- /* -- * Bump ACLK to max. possible freq. (500 MHz) to improve performance -- * When 4k video playback. -- */ -- clk_set_rate(rkvdec->clocks[0].clk, 500 * 1000 * 1000); -- - rkvdec->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(rkvdec->regs)) - return PTR_ERR(rkvdec->regs); --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 5b8958639a9..2cca1ab2e4b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -227,7 +227,6 @@ net-hinic-add-missing-destroy_workqueue-in-hinic_pf_.patch asoc-ti-j721e-evm-fix-refcount-leak-in-j721e_soc_pro.patch media-ov7670-remove-ov7670_power_off-from-ov7670_rem.patch media-staging-media-rkvdec-make-use-of-the-helper-fu.patch -media-rkvdec-stop-overclocking-the-decoder.patch media-rkvdec-h264-fix-dpb_valid-implementation.patch media-rkvdec-h264-fix-bit-depth-wrap-in-pps-packet.patch ext4-reject-the-commit-option-on-ext2-filesystems.patch diff --git a/queue-5.15/media-rkvdec-stop-overclocking-the-decoder.patch b/queue-5.15/media-rkvdec-stop-overclocking-the-decoder.patch deleted file mode 100644 index bb1def71a1a..00000000000 --- a/queue-5.15/media-rkvdec-stop-overclocking-the-decoder.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc323a230b5ce7be8759424390e64703057dad47 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 13 May 2022 22:29:10 +0200 -Subject: media: rkvdec: Stop overclocking the decoder - -From: Nicolas Dufresne - -[ Upstream commit 9998943f6dfc5d5472bfab2e38527fb6ba5e9da7 ] - -While this overclock hack seems to work on some implementations -(some ChromeBooks, RockPi4) it also causes instability on other -implementations (notably LibreComputer Renegade, but there were more -reports in the LibreELEC project, where this has been removed). While -performance is indeed affected (tested with GStreamer), 4K playback -still works as long as you don't operate in lock step and keep at -least 1 frame ahead of time in the decode queue. - -After discussion with ChromeOS members, it would seem that their -implementation indeed used to synchronously decode each frame, so -this hack was simply compensating for their code being less -efficient. In my opinion, this hack should not have been included -upstream. - -Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver") -Signed-off-by: Nicolas Dufresne -Reviewed-by: Sebastian Fricke -Reviewed-by: Ezequiel Garcia -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/staging/media/rkvdec/rkvdec.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 4fd4a2907da7..8d700081509e 100644 ---- a/drivers/staging/media/rkvdec/rkvdec.c -+++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -992,12 +992,6 @@ static int rkvdec_probe(struct platform_device *pdev) - if (ret) - return ret; - -- /* -- * Bump ACLK to max. possible freq. (500 MHz) to improve performance -- * When 4k video playback. -- */ -- clk_set_rate(rkvdec->clocks[0].clk, 500 * 1000 * 1000); -- - rkvdec->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(rkvdec->regs)) - return PTR_ERR(rkvdec->regs); --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 5b2c62fd252..65fcd94376f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -338,7 +338,6 @@ kselftest-arm64-bti-force-static-linking.patch media-ov7670-remove-ov7670_power_off-from-ov7670_rem.patch media-i2c-ov5648-fix-wrong-pointer-passed-to-is_err-.patch media-staging-media-rkvdec-make-use-of-the-helper-fu.patch -media-rkvdec-stop-overclocking-the-decoder.patch media-rkvdec-h264-fix-dpb_valid-implementation.patch media-rkvdec-h264-fix-bit-depth-wrap-in-pps-packet.patch regulator-scmi-fix-refcount-leak-in-scmi_regulator_p.patch diff --git a/queue-5.17/media-rkvdec-stop-overclocking-the-decoder.patch b/queue-5.17/media-rkvdec-stop-overclocking-the-decoder.patch deleted file mode 100644 index d330fe01db7..00000000000 --- a/queue-5.17/media-rkvdec-stop-overclocking-the-decoder.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9829abc99e444db35b16c123d5cfca40d9a93085 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 13 May 2022 22:29:10 +0200 -Subject: media: rkvdec: Stop overclocking the decoder - -From: Nicolas Dufresne - -[ Upstream commit 9998943f6dfc5d5472bfab2e38527fb6ba5e9da7 ] - -While this overclock hack seems to work on some implementations -(some ChromeBooks, RockPi4) it also causes instability on other -implementations (notably LibreComputer Renegade, but there were more -reports in the LibreELEC project, where this has been removed). While -performance is indeed affected (tested with GStreamer), 4K playback -still works as long as you don't operate in lock step and keep at -least 1 frame ahead of time in the decode queue. - -After discussion with ChromeOS members, it would seem that their -implementation indeed used to synchronously decode each frame, so -this hack was simply compensating for their code being less -efficient. In my opinion, this hack should not have been included -upstream. - -Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver") -Signed-off-by: Nicolas Dufresne -Reviewed-by: Sebastian Fricke -Reviewed-by: Ezequiel Garcia -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/staging/media/rkvdec/rkvdec.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index c0cf3488f970..2df8cf4883e2 100644 ---- a/drivers/staging/media/rkvdec/rkvdec.c -+++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -1027,12 +1027,6 @@ static int rkvdec_probe(struct platform_device *pdev) - if (ret) - return ret; - -- /* -- * Bump ACLK to max. possible freq. (500 MHz) to improve performance -- * When 4k video playback. -- */ -- clk_set_rate(rkvdec->clocks[0].clk, 500 * 1000 * 1000); -- - rkvdec->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(rkvdec->regs)) - return PTR_ERR(rkvdec->regs); --- -2.35.1 - diff --git a/queue-5.17/series b/queue-5.17/series index 11b4b8bb6ed..734d6fa5a0c 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -401,7 +401,6 @@ asoc-ti-j721e-evm-fix-refcount-leak-in-j721e_soc_pro.patch kselftest-arm64-bti-force-static-linking.patch media-ov7670-remove-ov7670_power_off-from-ov7670_rem.patch media-i2c-ov5648-fix-wrong-pointer-passed-to-is_err-.patch -media-rkvdec-stop-overclocking-the-decoder.patch media-rkvdec-h264-fix-dpb_valid-implementation.patch media-rkvdec-h264-fix-bit-depth-wrap-in-pps-packet.patch regulator-scmi-fix-refcount-leak-in-scmi_regulator_p.patch diff --git a/queue-5.18/media-rkvdec-stop-overclocking-the-decoder.patch b/queue-5.18/media-rkvdec-stop-overclocking-the-decoder.patch deleted file mode 100644 index 493a641b724..00000000000 --- a/queue-5.18/media-rkvdec-stop-overclocking-the-decoder.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3440e227b08784c954abb2bb540d931e22d0d675 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 13 May 2022 22:29:10 +0200 -Subject: media: rkvdec: Stop overclocking the decoder - -From: Nicolas Dufresne - -[ Upstream commit 9998943f6dfc5d5472bfab2e38527fb6ba5e9da7 ] - -While this overclock hack seems to work on some implementations -(some ChromeBooks, RockPi4) it also causes instability on other -implementations (notably LibreComputer Renegade, but there were more -reports in the LibreELEC project, where this has been removed). While -performance is indeed affected (tested with GStreamer), 4K playback -still works as long as you don't operate in lock step and keep at -least 1 frame ahead of time in the decode queue. - -After discussion with ChromeOS members, it would seem that their -implementation indeed used to synchronously decode each frame, so -this hack was simply compensating for their code being less -efficient. In my opinion, this hack should not have been included -upstream. - -Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver") -Signed-off-by: Nicolas Dufresne -Reviewed-by: Sebastian Fricke -Reviewed-by: Ezequiel Garcia -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin ---- - drivers/staging/media/rkvdec/rkvdec.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index c0cf3488f970..2df8cf4883e2 100644 ---- a/drivers/staging/media/rkvdec/rkvdec.c -+++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -1027,12 +1027,6 @@ static int rkvdec_probe(struct platform_device *pdev) - if (ret) - return ret; - -- /* -- * Bump ACLK to max. possible freq. (500 MHz) to improve performance -- * When 4k video playback. -- */ -- clk_set_rate(rkvdec->clocks[0].clk, 500 * 1000 * 1000); -- - rkvdec->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(rkvdec->regs)) - return PTR_ERR(rkvdec->regs); --- -2.35.1 - diff --git a/queue-5.18/series b/queue-5.18/series index 9b5b10f251e..24792deb253 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -472,7 +472,6 @@ kselftest-arm64-bti-force-static-linking.patch media-ov7670-remove-ov7670_power_off-from-ov7670_rem.patch media-i2c-ov2640-depend-on-v4l2_async.patch media-i2c-ov5648-fix-wrong-pointer-passed-to-is_err-.patch -media-rkvdec-stop-overclocking-the-decoder.patch media-rkvdec-h264-fix-dpb_valid-implementation.patch media-rkvdec-h264-fix-bit-depth-wrap-in-pps-packet.patch regulator-scmi-fix-refcount-leak-in-scmi_regulator_p.patch