diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-10-23 07:46:42 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:50 -0400 |
commit | 4c12bbce3950077c81e5a04629a686af145aa5af (patch) | |
tree | 2155d84086506b1e0e3b893f087aa42881f64489 /drivers | |
parent | 3446d89539253f88353672792c0e198b6220487e (diff) |
gpu: nvgpu: Fix build break with no PM runtime
Bug 1567274
Change-Id: I6ca10e329a46edf859f5b22f18d0da9bc8f41cd6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/562474
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 98dce955..5641818e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1599,8 +1599,8 @@ int gk20a_busy(struct platform_device *pdev) | |||
1599 | #else | 1599 | #else |
1600 | if (!g->power_on) { | 1600 | if (!g->power_on) { |
1601 | ret = platform->virtual_dev ? | 1601 | ret = platform->virtual_dev ? |
1602 | vgpu_pm_finalize_poweron(&dev->dev) | 1602 | vgpu_pm_finalize_poweron(&pdev->dev) |
1603 | : gk20a_pm_finalize_poweron(&dev->dev); | 1603 | : gk20a_pm_finalize_poweron(&pdev->dev); |
1604 | if (ret) | 1604 | if (ret) |
1605 | goto fail; | 1605 | goto fail; |
1606 | } | 1606 | } |
@@ -1615,8 +1615,8 @@ fail: | |||
1615 | 1615 | ||
1616 | void gk20a_idle(struct platform_device *pdev) | 1616 | void gk20a_idle(struct platform_device *pdev) |
1617 | { | 1617 | { |
1618 | struct gk20a_platform *platform = gk20a_get_platform(pdev); | ||
1619 | #ifdef CONFIG_PM_RUNTIME | 1618 | #ifdef CONFIG_PM_RUNTIME |
1619 | struct gk20a_platform *platform = gk20a_get_platform(pdev); | ||
1620 | if (atomic_read(&pdev->dev.power.usage_count) == 1) | 1620 | if (atomic_read(&pdev->dev.power.usage_count) == 1) |
1621 | gk20a_scale_notify_idle(pdev); | 1621 | gk20a_scale_notify_idle(pdev); |
1622 | pm_runtime_mark_last_busy(&pdev->dev); | 1622 | pm_runtime_mark_last_busy(&pdev->dev); |