From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Thu, 23 Oct 2014 11:46:42 +0000 (+0300)
Subject: gpu: nvgpu: Fix build break with no PM runtime
X-Git-Tag: tegra-l4t-r23.1~4938
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/nv-tegra/linux-3.10.git/commitdiff_plain/3962ea4da8bbff70ff3ca42b95733c9b1f9ad26b

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>
---

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 9388713e664..ede2907f898 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)
 #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);