nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Call railgate only if defined

Browse Source 
Call railgate and unrailgate ops only if they are defined.

Change-Id: I0a87ac0259af3719098d4372be7e25f0a54416fc
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/396375
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Bo Yan <byan@nvidia.com>
This commit is contained in:
Terje Bergstrom
2014-04-15 10:54:45 +03:00
committed by Dan Willemsen
parent d830140db7
commit 7a27ca81d2
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -1182,15 +1182,29 @@ const struct dev_pm_ops gk20a_pm_ops = {
};
#endif
static int _gk20a_pm_railgate(struct platform_device *pdev)
{
struct gk20a_platform *platform = platform_get_drvdata(pdev);
int ret = 0;
if (platform->railgate)
ret = platform->railgate(pdev);
return ret;
}
static int gk20a_pm_railgate(struct generic_pm_domain *domain)
{
struct gk20a *g = container_of(domain, struct gk20a, pd);
struct gk20a_platform *platform = platform_get_drvdata(g->dev);
return _gk20a_pm_railgate(platform->g->dev);
}
static int _gk20a_pm_unrailgate(struct platform_device *pdev)
{
struct gk20a_platform *platform = platform_get_drvdata(pdev);
int ret = 0;
if (platform->railgate)
ret = platform->railgate(platform->g->dev);
if (platform->unrailgate)
ret = platform->unrailgate(pdev);
return ret;
}
@@ -1198,12 +1212,8 @@ static int gk20a_pm_unrailgate(struct generic_pm_domain *domain)
{
struct gk20a *g = container_of(domain, struct gk20a, pd);
struct gk20a_platform *platform = platform_get_drvdata(g->dev);
int ret = 0;
if (platform->unrailgate)
ret = platform->unrailgate(platform->g->dev);
return ret;
return _gk20a_pm_unrailgate(platform->g->dev);
}
static int gk20a_pm_suspend(struct device *dev)
@@ -1274,6 +1284,8 @@ static int gk20a_pm_init(struct platform_device *dev)
struct gk20a_platform *platform = platform_get_drvdata(dev);
int err = 0;
gk20a_dbg_fn("");
/* Initialise pm runtime */
if (platform->clockgate_delay) {
pm_runtime_set_autosuspend_delay(&dev->dev,
@@ -1288,9 +1300,9 @@ static int gk20a_pm_init(struct platform_device *dev)
/* Enable runtime railgating if possible. If not,
* turn on the rail now. */
if (platform->can_railgate && IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
platform->railgate(dev);
_gk20a_pm_railgate(dev);
else
platform->unrailgate(dev);
_gk20a_pm_unrailgate(dev);
/* genpd will take care of runtime power management if it is enabled */
if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))