diff options
| author | Shawn Xiao <b49994@freescale.com> | 2016-02-22 14:48:25 +0800 |
|---|---|---|
| committer | Xianzhong <xianzhong.li@nxp.com> | 2017-11-16 01:03:04 +0800 |
| commit | 32f868f9e56f8f1b42e2c2374e2205c01f2e3bae (patch) | |
| tree | 24de7d6a6a4c9817aad9c8c3d49ad5d2bfe1407c | |
| parent | 4e4ca7be48dbd753d6f4a68c1eb2a829d48f7655 (diff) | |
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 <b49994@freescale.com>
(cherry picked from commit 51e52f5fd866cd8957e2ab6a5474bd3c15685f6a)
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c | 4 |
1 files changed, 1 insertions, 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; |