summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2014-05-07 06:09:36 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:09:48 -0400
commit66bb831f44312b8490470e3ea4fee2947167bc7f (patch)
tree635e4d474503f5621fd04e4f7ec87de6e3c6f518 /drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
parent69f5a5718b6a5d9dd30dea5c2d31bfdf1d3fca71 (diff)
gpu: nvgpu: Register as subdomain of host1x
Add gk20a as a sub power domain of host1x. This enforces keeping host1x on when using gk20a. Bug 200003112 Change-Id: I08db595bc7b819d86d33fb98af0d8fb4de369463 Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/407006 (cherry picked from commit 009812b3e510518740e9c7e89b8b8b80439fe26a) Reviewed-on: http://git-master/r/408013 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 2d2cf220..9ebc5bab 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_channel_busy(g->dev); 304 err = gk20a_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_channel_idle(g->dev); 315 gk20a_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");