diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2015-01-08 15:58:12 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-04-04 21:02:17 -0400 |
commit | 8b887af59a90d86fcf0f242e826131144eb6a770 (patch) | |
tree | 5ce36b0f9f361d47eda094ce70367e1e38d89e3b /drivers/gpu/nvgpu | |
parent | c3892ff917ad63ae63ad20d70f89583fb8213ce3 (diff) |
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 <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/671208
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
769 | 769 | ||
770 | return NULL; | 770 | return NULL; |
771 | } | 771 | } |
772 | g->ops.fifo.bind_channel(ch); | ||
773 | ch->pid = current->pid; | 772 | ch->pid = current->pid; |
774 | 773 | ||
775 | /* By default, channel is regular (non-TSG) channel */ | 774 | /* By default, channel is regular (non-TSG) channel */ |
@@ -1217,6 +1216,8 @@ int gk20a_alloc_channel_gpfifo(struct channel_gk20a *c, | |||
1217 | if (err) | 1216 | if (err) |
1218 | goto clean_up_unmap; | 1217 | goto clean_up_unmap; |
1219 | 1218 | ||
1219 | g->ops.fifo.bind_channel(c); | ||
1220 | |||
1220 | gk20a_free_sgtable(&sgt); | 1221 | gk20a_free_sgtable(&sgt); |
1221 | 1222 | ||
1222 | gk20a_dbg_fn("done"); | 1223 | gk20a_dbg_fn("done"); |