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:48 -0400 |
commit | 66bb831f44312b8490470e3ea4fee2947167bc7f (patch) | |
tree | 635e4d474503f5621fd04e4f7ec87de6e3c6f518 /drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |
parent | 69f5a5718b6a5d9dd30dea5c2d31bfdf1d3fca71 (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/dbg_gpu_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 9fe1729f..77806a5e 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -573,7 +573,7 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, | |||
573 | 573 | ||
574 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module busy"); | 574 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module busy"); |
575 | gk20a_busy(g->dev); | 575 | gk20a_busy(g->dev); |
576 | err = gk20a_channel_busy(dbg_s->pdev); | 576 | err = gk20a_busy(dbg_s->pdev); |
577 | if (err) | 577 | if (err) |
578 | return -EPERM; | 578 | return -EPERM; |
579 | 579 | ||
@@ -618,7 +618,7 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, | |||
618 | gk20a_pmu_enable_elpg(g); | 618 | gk20a_pmu_enable_elpg(g); |
619 | 619 | ||
620 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module idle"); | 620 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module idle"); |
621 | gk20a_channel_idle(dbg_s->pdev); | 621 | gk20a_idle(dbg_s->pdev); |
622 | gk20a_idle(g->dev); | 622 | gk20a_idle(g->dev); |
623 | } | 623 | } |
624 | 624 | ||