]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ENGR00240988: gpu: comment out busfreq calls for 3.10 kernel
authorShawn Guo <shawn.guo@freescale.com>
Fri, 26 Jul 2013 09:25:33 +0000 (17:25 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 20 Aug 2014 08:06:07 +0000 (10:06 +0200)
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>
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_driver.c

index 9d9dc57a78d2cc8d6cf945283a1b609cd007d108..7d475642719aecb9da236d4623adaf18d5924934 100644 (file)
@@ -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;
 }