CHROMIUM: Fix for unclose MFGPLL clock
Fix for unclose MFGPLL (GPU main) clock source
[Details]
We have already implement the GPU power callbacks to
handle the GPU clock source.
This clock source will remain unclosed while system
require a suspend, so we don't need to handle it here.
BUG=b:121988437
TEST=emerge-kukui chromeos-kernel-4_19
Signed-off-by: Nick Fan <Nick.Fan@mediatek.com>
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
Reviewed-on: https://chromium-review.googlesource.com/1433153
Commit-Ready: Nick Fan <nick.fan@mediatek.corp-partner.google.com>
Tested-by: Nick Fan <nick.fan@mediatek.corp-partner.google.com>
Reviewed-by: Nick Fan <nick.fan@mediatek.corp-partner.google.com>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
(cherry picked from commit f870bb588a75117872acdd1933158513a927149d)
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
[rebase on r20p0
drinkcat: power_control_term checks if the clock is already
disabled, so we should be fine.]
Change-Id: I5617831050d87b2c511b4a072dcb1c93623b8926
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 57acbf9..f2c5477 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3471,19 +3471,9 @@
kbdev->clocks[i] = NULL;
break;
}
-
- err = clk_prepare_enable(kbdev->clocks[i]);
- if (err) {
- dev_err(kbdev->dev,
- "Failed to prepare and enable clock (%d)\n",
- err);
- clk_put(kbdev->clocks[i]);
- break;
- }
}
if (err == -EPROBE_DEFER) {
while ((i > 0) && (i < BASE_MAX_NR_CLOCKS_REGULATORS)) {
- clk_disable_unprepare(kbdev->clocks[--i]);
clk_put(kbdev->clocks[i]);
}
goto clocks_probe_defer;
@@ -3551,8 +3541,6 @@
for (i = 0; i < BASE_MAX_NR_CLOCKS_REGULATORS; i++) {
if (kbdev->clocks[i]) {
- if (__clk_is_enabled(kbdev->clocks[i]))
- clk_disable_unprepare(kbdev->clocks[i]);
clk_put(kbdev->clocks[i]);
kbdev->clocks[i] = NULL;
} else
