]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
gpu: nvgpu: Fix build break with no PM runtime
authorTerje Bergstrom <tbergstrom@nvidia.com>
Thu, 23 Oct 2014 11:46:42 +0000 (14:46 +0300)
committerTerje Bergstrom <tbergstrom@nvidia.com>
Thu, 23 Oct 2014 14:04:25 +0000 (07:04 -0700)
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>
drivers/gpu/nvgpu/gk20a/gk20a.c

index 9388713e664dd62cb36d4ab26e41892741c7c852..ede2907f89819385f5c5f34b3b86f5064a4b11e8 100644 (file)
@@ -1599,8 +1599,8 @@ int gk20a_busy(struct platform_device *pdev)
 #else
        if (!g->power_on) {
                ret = platform->virtual_dev ?
-                       vgpu_pm_finalize_poweron(&dev->dev)
-                       : gk20a_pm_finalize_poweron(&dev->dev);
+                       vgpu_pm_finalize_poweron(&pdev->dev)
+                       : gk20a_pm_finalize_poweron(&pdev->dev);
                if (ret)
                        goto fail;
        }
@@ -1615,8 +1615,8 @@ fail:
 
 void gk20a_idle(struct platform_device *pdev)
 {
-       struct gk20a_platform *platform = gk20a_get_platform(pdev);
 #ifdef CONFIG_PM_RUNTIME
+       struct gk20a_platform *platform = gk20a_get_platform(pdev);
        if (atomic_read(&pdev->dev.power.usage_count) == 1)
                gk20a_scale_notify_idle(pdev);
        pm_runtime_mark_last_busy(&pdev->dev);