From e7668db9997471f29bc8bd9b9e2c93732d5ad495 Mon Sep 17 00:00:00 2001 From: Shawn Xiao Date: Mon, 22 Feb 2016 14:48:25 +0800 Subject: [PATCH] MGS-1633 [#2235] Replace CONFIG_PM_RUNTIME with CONFIG_PM Since 4.1, linux kernel has dropped CONFIG_PM_RUNTIME macro. And CONFIG_PM is used instead. GPU driver should be synced with the change. Date Feb 22, 2016 Signed-off-by: Shawn Xiao --- .../kernel/platform/freescale/gc_hal_kernel_platform_imx6.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c index b96d6db43df1..92189829f555 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c @@ -1417,7 +1417,6 @@ int set_clock(int gpu, int enable) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) #ifdef CONFIG_PM -#ifdef CONFIG_PM_RUNTIME static int gpu_runtime_suspend(struct device *dev) { release_bus_freq(BUS_FREQ_HIGH); @@ -1429,7 +1428,6 @@ static int gpu_runtime_resume(struct device *dev) request_bus_freq(BUS_FREQ_HIGH); return 0; } -#endif static struct dev_pm_ops gpu_pm_ops; #endif @@ -1449,7 +1447,7 @@ static int adjust_platform_driver(struct platform_driver *driver) memcpy(&gpu_pm_ops, driver->driver.pm, sizeof(struct dev_pm_ops)); /* Add runtime PM callback. */ -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM gpu_pm_ops.runtime_suspend = gpu_runtime_suspend; gpu_pm_ops.runtime_resume = gpu_runtime_resume; gpu_pm_ops.runtime_idle = NULL; -- 2.17.1