From 6c6936858af4902ca0e170da03ddf92e32b74ae1 Mon Sep 17 00:00:00 2001 From: Matt Pedro Date: Sun, 11 May 2014 22:57:48 -0400 Subject: Revert "gpu: nvgpu: Keep host1x on when GPU on" This reverts commit 20d48a759b032116e3092e1df76518065da59879. Change-Id: I93718a314b70ee9284a83ca69964883e670ad78d Signed-off-by: Matt Pedro Reviewed-on: http://git-master/r/407969 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c') 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, * Since elpg is refcounted, we should not unnecessarily call * enable/disable if it is already so. */ - err = gk20a_busy(g->dev); + err = gk20a_channel_busy(g->dev); if (err) return -EAGAIN; @@ -312,7 +312,7 @@ static ssize_t elpg_enable_store(struct device *device, g->elpg_enabled = false; gk20a_pmu_disable_elpg(g); } - gk20a_idle(g->dev); + gk20a_channel_idle(g->dev); dev_info(device, "ELPG is %s.\n", g->elpg_enabled ? "enabled" : "disabled"); -- cgit v1.2.2