blob: 38ab4042d075c3db8bdc2686143c4ffc260c91cf [file] [log] [blame]
From aeff13ad9e9ef73172a9325f669aefd3c0403dbb Mon Sep 17 00:00:00 2001
From: Madhurkiran Harikrishnan <madhurki@xilinx.com>
Date: Wed, 21 Feb 2018 16:52:15 -0800
Subject: [PATCH] linux/mali_kernel_linux.c: Enable/disable clock for runtime
resume/suspend
Enable/Disable the clock for GP,PP0 and PP1 during runtime
resume/suspend.
Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com>
Reviewed-by: Hyun Kwon <hyunk@xilinx.com>
Upstream Status: Inappropriate [Xilinx specific]
---
.../src/devicedrv/mali/linux/mali_kernel_linux.c | 65 ++++++++++++++++++----
1 file changed, 54 insertions(+), 11 deletions(-)
diff --git a/driver/src/devicedrv/mali/linux/mali_kernel_linux.c b/driver/src/devicedrv/mali/linux/mali_kernel_linux.c
index f15fb56..e61f33b 100644
--- linux/mali_kernel_linux.c
+++ b/linux/mali_kernel_linux.c
@@ -51,6 +51,7 @@
struct clk *clk_gpu;
struct clk *clk_gpu_pp0;
struct clk *clk_gpu_pp1;
+mali_bool clk_enabled;
#endif
#if defined(CONFIG_MALI400_PROFILING) && defined(CONFIG_MALI_DVFS)
@@ -281,6 +282,46 @@ struct file_operations mali_fops = {
.mmap = mali_mmap
};
+static int mali_enable_clk(void)
+{
+#if defined(CONFIG_ARCH_ZYNQMP)
+ int err = 0;
+
+ if (clk_enabled)
+ return 0;
+
+ clk_enabled = MALI_TRUE;
+ err = clk_prepare_enable(clk_gpu);
+ if (err) {
+ MALI_PRINT_ERROR(("Could not enable clock for GP\n\r"));
+ return err;
+ }
+ err = clk_prepare_enable(clk_gpu_pp0);
+ if (err) {
+ MALI_PRINT_ERROR(("Could not enable clock for PP0\n\r"));
+ return err;
+ }
+ err = clk_prepare_enable(clk_gpu_pp1);
+ if (err) {
+ MALI_PRINT_ERROR(("Could not enable clock for PP1\n\r"));
+ return err;
+ }
+#endif
+ return 0;
+}
+
+static void mali_disable_clk(void)
+{
+#if defined(CONFIG_ARCH_ZYNQMP)
+ if (clk_enabled) {
+ clk_enabled = MALI_FALSE;
+ clk_disable_unprepare(clk_gpu);
+ clk_disable_unprepare(clk_gpu_pp0);
+ clk_disable_unprepare(clk_gpu_pp1);
+ }
+#endif
+}
+
#if MALI_ENABLE_CPU_CYCLES
void mali_init_cpu_time_counters(int reset, int enable_divide_by_64)
{
@@ -593,18 +634,19 @@ static int mali_probe(struct platform_device *pdev)
clk_gpu = devm_clk_get(&pdev->dev, "gpu");
if (IS_ERR(clk_gpu))
return PTR_ERR(clk_gpu);
- clk_prepare_enable(clk_gpu);
clk_gpu_pp0 = devm_clk_get(&pdev->dev, "gpu_pp0");
if (IS_ERR(clk_gpu_pp0))
return PTR_ERR(clk_gpu_pp0);
- clk_prepare_enable(clk_gpu_pp0);
clk_gpu_pp1 = devm_clk_get(&pdev->dev, "gpu_pp1");
if (IS_ERR(clk_gpu_pp1))
return PTR_ERR(clk_gpu_pp1);
- clk_prepare_enable(clk_gpu_pp1);
#endif
+
+ err = mali_enable_clk();
+ if (err)
+ return err;
if (_MALI_OSK_ERR_OK == _mali_osk_wq_init()) {
/* Initialize the Mali GPU HW specified by pdev */
if (_MALI_OSK_ERR_OK == mali_initialize_subsystems()) {
@@ -632,11 +674,6 @@ static int mali_probe(struct platform_device *pdev)
_mali_osk_wq_term();
}
-#if defined(CONFIG_ARCH_ZYNQMP)
- clk_disable_unprepare(clk_gpu);
- clk_disable_unprepare(clk_gpu_pp0);
- clk_disable_unprepare(clk_gpu_pp1);
-#endif
#ifdef CONFIG_MALI_DEVFREQ
mali_devfreq_term(mdev);
@@ -644,6 +681,7 @@ devfreq_init_failed:
mali_pm_metrics_term(mdev);
pm_metrics_init_failed:
clk_disable_unprepare(mdev->clock);
+ mali_disable_clk();
clock_prepare_failed:
clk_put(mdev->clock);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \
@@ -706,9 +744,7 @@ static int mali_remove(struct platform_device *pdev)
#if defined(CONFIG_ARCH_ZYNQMP)
/* Remove clock */
- clk_disable_unprepare(clk_gpu);
- clk_disable_unprepare(clk_gpu_pp0);
- clk_disable_unprepare(clk_gpu_pp1);
+ mali_disable_clk();
#endif
return 0;
@@ -816,6 +852,8 @@ static int mali_driver_runtime_suspend(struct device *dev)
devfreq_suspend_device(mdev->devfreq);
#endif
+ mali_disable_clk();
+
return 0;
} else {
return -EBUSY;
@@ -824,6 +862,11 @@ static int mali_driver_runtime_suspend(struct device *dev)
static int mali_driver_runtime_resume(struct device *dev)
{
+ int err ;
+
+ err = mali_enable_clk();
+ if (err)
+ return err;
#ifdef CONFIG_MALI_DEVFREQ
struct mali_device *mdev = dev_get_drvdata(dev);
if (!mdev)
--
2.7.4