diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-07 06:09:36 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:20 -0400 |
commit | 4ac110cb8a46a0c91a4a1e39c168de1b49688971 (patch) | |
tree | 5cf832c256e8e7b4c28c2a08ed28614d44c00ea4 /drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | |
parent | 4d93f777450e5bf46d5001426b3a437810cd852b (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/407543
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | 4 |
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 a5267eac..335c3f3b 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | |||
@@ -279,7 +279,7 @@ static ssize_t elpg_enable_store(struct device *device, | |||
279 | * Since elpg is refcounted, we should not unnecessarily call | 279 | * Since elpg is refcounted, we should not unnecessarily call |
280 | * enable/disable if it is already so. | 280 | * enable/disable if it is already so. |
281 | */ | 281 | */ |
282 | err = gk20a_channel_busy(g->dev); | 282 | err = gk20a_busy(g->dev); |
283 | if (err) | 283 | if (err) |
284 | return -EAGAIN; | 284 | return -EAGAIN; |
285 | 285 | ||
@@ -290,7 +290,7 @@ static ssize_t elpg_enable_store(struct device *device, | |||
290 | g->elpg_enabled = false; | 290 | g->elpg_enabled = false; |
291 | gk20a_pmu_disable_elpg(g); | 291 | gk20a_pmu_disable_elpg(g); |
292 | } | 292 | } |
293 | gk20a_channel_idle(g->dev); | 293 | gk20a_idle(g->dev); |
294 | 294 | ||
295 | dev_info(device, "ELPG is %s.\n", g->elpg_enabled ? "enabled" : | 295 | dev_info(device, "ELPG is %s.\n", g->elpg_enabled ? "enabled" : |
296 | "disabled"); | 296 | "disabled"); |