From 4ac110cb8a46a0c91a4a1e39c168de1b49688971 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 7 May 2014 13:09:36 +0300 Subject: 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 Reviewed-on: http://git-master/r/407543 Reviewed-by: Riham Haidar Tested-by: Riham Haidar --- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c') 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, 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 -- cgit v1.2.2