summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.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:20 -0400
commit4ac110cb8a46a0c91a4a1e39c168de1b49688971 (patch)
tree5cf832c256e8e7b4c28c2a08ed28614d44c00ea4 /drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
parent4d93f777450e5bf46d5001426b3a437810cd852b (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.c4
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 525d8638..841ec596 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,
227 227
228 if (register_irq) { 228 if (register_irq) {
229 /* nvhost action_gpfifo_submit_complete releases this ref. */ 229 /* nvhost action_gpfifo_submit_complete releases this ref. */
230 err = gk20a_channel_busy(c->g->dev); 230 err = gk20a_busy(c->g->dev);
231 231
232 if (!err) { 232 if (!err) {
233 err = nvhost_intr_register_notifier(sp->host1x_pdev, 233 err = nvhost_intr_register_notifier(sp->host1x_pdev,
234 sp->id, thresh, 234 sp->id, thresh,
235 gk20a_channel_syncpt_update, c); 235 gk20a_channel_syncpt_update, c);
236 if (err) 236 if (err)
237 gk20a_channel_idle(c->g->dev); 237 gk20a_idle(c->g->dev);
238 } 238 }
239 239
240 /* Adding interrupt action should never fail. A proper error 240 /* Adding interrupt action should never fail. A proper error