diff options
| author | Prabhu Sundararaj <prabhu.sundararaj@nxp.com> | 2017-02-17 14:22:43 -0600 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2017-10-05 14:45:04 +0300 |
| commit | 365fdd3cfd45e225701d9a8de8c08af1e2b3d97d (patch) | |
| tree | 7f1cdc589673244734374ef6ed90be3027ac02d0 /drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c | |
| parent | 15022fb77d2687c2e034b2993d6ba2ee113264f9 (diff) | |
MGS-2664-7 [#imx-403] request "gpu2d" and "gpuvg" resets as shared
These resets are shared at least on im6q, so request them as shared to
avoid devm_reset_control_get() failures since Linux 4.9 upstream has modified it
to assume exclusive usage.
Date: Feb 17, 2016
Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c | 6 |
1 files changed, 6 insertions, 0 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 0082e1fea314..8a06b471666e 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 @@ -617,9 +617,15 @@ _GetPower( #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) rstc = devm_reset_control_get(pdev, "gpu3d"); priv->rstc[gcvCORE_MAJOR] = IS_ERR(rstc) ? NULL : rstc; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) rstc = devm_reset_control_get_shared(pdev, "gpu2d"); priv->rstc[gcvCORE_2D] = IS_ERR(rstc) ? NULL : rstc; rstc = devm_reset_control_get_shared(pdev, "gpuvg"); +#else + rstc = devm_reset_control_get(pdev, "gpu2d"); + priv->rstc[gcvCORE_2D] = IS_ERR(rstc) ? NULL : rstc; + rstc = devm_reset_control_get(pdev, "gpuvg"); +#endif priv->rstc[gcvCORE_VG] = IS_ERR(rstc) ? NULL : rstc; #endif #endif |