code.ossystems Code Review - meta-freescale.git/blob

   1 From 1579de9397783ab5321c80f1e76661653ef38ccd Mon Sep 17 00:00:00 2001
   2 From: Robin Gong <b38343@freescale.com>
   3 Date: Thu, 9 May 2013 11:45:55 +0800
   4 Subject: [PATCH 3/6] ENGR00261814-4 gpu: use new PU power on/off interface
   5
   6 use new PU power on/off interface in GPU driver
   7
   8 Upstream-Status: Backport [3.5.7-1.0.0]
   9
  10 Signed-off-by: Robin Gong <b38343@freescale.com>
  11 Acked-by: Lily Zhang
  12 ---
  13  .../mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c   | 16 +++++++++++++---
  14  1 file changed, 13 insertions(+), 3 deletions(-)
  15
  16 diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
  17 index 9c2bae6..dfbc699 100644
  18 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
  19 +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
  20 @@ -6819,8 +6819,13 @@ gckOS_SetGPUPower(
  21      }
  22         if((Power == gcvTRUE) && (oldPowerState == gcvFALSE))
  23         {
  24 -               if(!IS_ERR(Os->device->gpu_regulator))
  25 -            regulator_enable(Os->device->gpu_regulator);
  26 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
  27 +           if(!IS_ERR(Os->device->gpu_regulator))
  28 +               regulator_enable(Os->device->gpu_regulator);
  29 +#else
  30 +           imx_gpc_power_up_pu(true);
  31 +#endif
  32 +
  33  #ifdef CONFIG_PM
  34                 pm_runtime_get_sync(Os->device->pmdev);
  35  #endif
  36 @@ -6930,8 +6935,13 @@ gckOS_SetGPUPower(
  37  #ifdef CONFIG_PM
  38                 pm_runtime_put_sync(Os->device->pmdev);
  39  #endif
  40 +
  41 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
  42                 if(!IS_ERR(Os->device->gpu_regulator))
  43 -            regulator_disable(Os->device->gpu_regulator);
  44 +                       regulator_disable(Os->device->gpu_regulator);
  45 +#else
  46 +               imx_gpc_power_up_pu(false);
  47 +#endif
  48         }
  49      /* TODO: Put your code here. */
  50      gcmkFOOTER_NO();
  51 --
  52 1.8.3.2
  53