From 8b887af59a90d86fcf0f242e826131144eb6a770 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Thu, 8 Jan 2015 12:58:12 -0800 Subject: gpu: nvgpu: correct channel open sequence Corrected sequence to bind and enable channel only afer channel gpfifo alloction done. Bug 1591647 Change-Id: I539458d1b666c0403cca1abcf8271b9c8c09f52c Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/671208 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 648450ae..b8f769a4 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -769,7 +769,6 @@ struct channel_gk20a *gk20a_open_new_channel(struct gk20a *g) return NULL; } - g->ops.fifo.bind_channel(ch); ch->pid = current->pid; /* By default, channel is regular (non-TSG) channel */ @@ -1217,6 +1216,8 @@ int gk20a_alloc_channel_gpfifo(struct channel_gk20a *c, if (err) goto clean_up_unmap; + g->ops.fifo.bind_channel(c); + gk20a_free_sgtable(&sgt); gk20a_dbg_fn("done"); -- cgit v1.2.2