From: Shawn Guo <shawn.guo@freescale.com>
Date: Fri, 26 Jul 2013 09:25:33 +0000 (+0800)
Subject: ENGR00240988: gpu: comment out busfreq calls for 3.10 kernel
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b71eceb2b84c88fc17fed8b2c11cb5aed7ac078;p=karo-tx-linux.git

ENGR00240988: gpu: comment out busfreq calls for 3.10 kernel

The busfreq driver is not ready yet on 3.10 kernel.  Let's comment out
the busfreq header inclusion and function calls for now, and revisit it
later when busfreq driver is ready.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---

diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
index 9d9dc57a78d2..7d475642719a 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c
@@ -69,8 +69,10 @@ task_notify_func(struct notifier_block *self, unsigned long val, void *data)
 #include <mach/viv_gpu.h>
 #else
 #include <linux/pm_runtime.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
 #include <mach/busfreq.h>
 #endif
+#endif
 /* Zone used for header/footer. */
 #define _GC_OBJ_ZONE    gcvZONE_DRIVER
 
@@ -1254,13 +1256,17 @@ MODULE_DEVICE_TABLE(of, mxs_gpu_dt_ids);
 #ifdef CONFIG_PM
 static int gpu_runtime_suspend(struct device *dev)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
 	release_bus_freq(BUS_FREQ_HIGH);
+#endif
 	return 0;
 }
 
 static int gpu_runtime_resume(struct device *dev)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
 	request_bus_freq(BUS_FREQ_HIGH);
+#endif
 	return 0;
 }