diff options
| author | Shawn Xiao <b49994@freescale.com> | 2016-02-22 15:04:41 +0800 |
|---|---|---|
| committer | Shawn Xiao <b49994@freescale.com> | 2016-02-22 15:08:19 +0800 |
| commit | fc7e4f4259cf0552a048a06a0ada8ac4a27075f8 (patch) | |
| tree | 9ffc1e79e465051b6b2a83c8b0049aa6919568e7 /drivers | |
| parent | a35ed81f83e4409a6d919bd99347430e5b215288 (diff) | |
MGS-1633 GPU: 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.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_imx6q14.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c index ddacbec2592c..e436ada6844c 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c @@ -869,7 +869,6 @@ _SetClock( #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); @@ -881,7 +880,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 @@ -906,7 +904,7 @@ _AdjustDriver( 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; |