150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
From 9bf91a052d8ceddfd5808547a51e167fb7463754 Mon Sep 17 00:00:00 2001
|
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
Date: Wed, 18 Jul 2018 19:59:21 +0200
|
|
Subject: [PATCH] GPU: Mali: Midgard: remove rcu_read_lock references
|
|
|
|
This patch is actually based on @mihailescu2m patch.
|
|
This removes references to rcu_read_lock when acquiring the OPP table,
|
|
as it is useless since.
|
|
See :
|
|
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/base/power/opp/core.c?id=5b650b388844f26c61c70564865598836d05dcb3
|
|
|
|
The current rcu_read_lock actually generates some issues with recent
|
|
kernels.
|
|
See here :
|
|
https://community.arm.com/graphics/f/discussions/9207/midgard-r20p0-kernel-drivers-errors
|
|
|
|
The patch has been recreated since it does not apply directly on r19p0
|
|
sources (I guess the affected line numbers slightly differ...).
|
|
|
|
@mihailescu2m patch for the Mali Midgard r20p0 kernel driver can be
|
|
acquired here :
|
|
https://github.com/mihailescu2m/linux/commit/bbe73c3c1143e5991bdcaee3afaecf5c31af0647
|
|
|
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
---
|
|
drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
|
|
index e280322e..bf69d897 100644
|
|
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
|
|
+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
|
|
@@ -87,10 +87,9 @@ kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags)
|
|
|
|
freq = *target_freq;
|
|
|
|
- rcu_read_lock();
|
|
opp = devfreq_recommended_opp(dev, &freq, flags);
|
|
voltage = dev_pm_opp_get_voltage(opp);
|
|
- rcu_read_unlock();
|
|
+
|
|
if (IS_ERR_OR_NULL(opp)) {
|
|
dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp));
|
|
return PTR_ERR(opp);
|
|
@@ -186,20 +185,17 @@ static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev,
|
|
unsigned long freq;
|
|
struct dev_pm_opp *opp;
|
|
|
|
- rcu_read_lock();
|
|
count = dev_pm_opp_get_opp_count(kbdev->dev);
|
|
if (count < 0) {
|
|
rcu_read_unlock();
|
|
return count;
|
|
}
|
|
- rcu_read_unlock();
|
|
|
|
dp->freq_table = kmalloc_array(count, sizeof(dp->freq_table[0]),
|
|
GFP_KERNEL);
|
|
if (!dp->freq_table)
|
|
return -ENOMEM;
|
|
|
|
- rcu_read_lock();
|
|
for (i = 0, freq = ULONG_MAX; i < count; i++, freq--) {
|
|
opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq);
|
|
if (IS_ERR(opp))
|
|
@@ -207,7 +203,6 @@ static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev,
|
|
|
|
dp->freq_table[i] = freq;
|
|
}
|
|
- rcu_read_unlock();
|
|
|
|
if (count != i)
|
|
dev_warn(kbdev->dev, "Unable to enumerate all OPPs (%d!=%d\n",
|
|
--
|
|
2.16.4
|
|
|