summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
diff options
context:
space:
mode:
authorMatt Pedro <mapedro@nvidia.com>2014-05-11 22:57:48 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:09:48 -0400
commit6c6936858af4902ca0e170da03ddf92e32b74ae1 (patch)
treeafc541fd72773aa4676188684b9c92a67af60a09 /drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
parenta82f92e318005f1e42f803aec054ee3714f780f9 (diff)
Revert "gpu: nvgpu: Keep host1x on when GPU on"
This reverts commit 20d48a759b032116e3092e1df76518065da59879. Change-Id: I93718a314b70ee9284a83ca69964883e670ad78d Signed-off-by: Matt Pedro <mapedro@nvidia.com> Reviewed-on: http://git-master/r/407969 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
index 9ebc5bab..2d2cf220 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
@@ -301,7 +301,7 @@ static ssize_t elpg_enable_store(struct device *device,
301 * Since elpg is refcounted, we should not unnecessarily call 301 * Since elpg is refcounted, we should not unnecessarily call
302 * enable/disable if it is already so. 302 * enable/disable if it is already so.
303 */ 303 */
304 err = gk20a_busy(g->dev); 304 err = gk20a_channel_busy(g->dev);
305 if (err) 305 if (err)
306 return -EAGAIN; 306 return -EAGAIN;
307 307
@@ -312,7 +312,7 @@ static ssize_t elpg_enable_store(struct device *device,
312 g->elpg_enabled = false; 312 g->elpg_enabled = false;
313 gk20a_pmu_disable_elpg(g); 313 gk20a_pmu_disable_elpg(g);
314 } 314 }
315 gk20a_idle(g->dev); 315 gk20a_channel_idle(g->dev);
316 316
317 dev_info(device, "ELPG is %s.\n", g->elpg_enabled ? "enabled" : 317 dev_info(device, "ELPG is %s.\n", g->elpg_enabled ? "enabled" :
318 "disabled"); 318 "disabled");