diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-07 13:09:36 +0300 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-12 16:36:21 -0700 |
| commit | 9c39e6f734160034e1ae9c2ec83c9c9998cf1022 (patch) | |
| tree | d9f9bc0e05aeb387f4c5f96e9a225ce4eb85e4de /drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |
| parent | 2a37d5d1af2efe5118ea5febfb52506baae80afa (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/channel_sync_gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index 525d86387068..841ec5967be2 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c @@ -227,14 +227,14 @@ static int __gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, if (register_irq) { /* nvhost action_gpfifo_submit_complete releases this ref. */ - err = gk20a_channel_busy(c->g->dev); + err = gk20a_busy(c->g->dev); if (!err) { err = nvhost_intr_register_notifier(sp->host1x_pdev, sp->id, thresh, gk20a_channel_syncpt_update, c); if (err) - gk20a_channel_idle(c->g->dev); + gk20a_idle(c->g->dev); } /* Adding interrupt action should never fail. A proper error |