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
Change-Id: I62e0304124dbddb293b33acb6afcdc71bb43f86c
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>
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 18fdafb..5383c76 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3182,14 +3182,6 @@
}
dev_info(kbdev->dev, "Continuing without Mali clock control\n");
/* Allow probe to continue without clock. */
- } else {
- err = clk_prepare_enable(kbdev->clock);
- if (err) {
- dev_err(kbdev->dev,
- "Failed to prepare and enable clock (%d)\n",
- err);
- goto fail;
- }
}
#if defined(CONFIG_OF) && defined(CONFIG_PM_OPP)
@@ -3251,7 +3243,6 @@
#endif
if (kbdev->clock) {
- clk_disable_unprepare(kbdev->clock);
clk_put(kbdev->clock);
kbdev->clock = NULL;
}
