nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fix error handling bug

Browse Source 
This change fixes error handling logic in
gk20a_alloc_channel_gpfifo(). In cases, where we don't
allocate a channel_sync at gpfifo allocation time,
we shouldn't attempt to destroy it while handling
an error.

Bug 200253447

Change-Id: I57a78c74bbce84fa17fb0360c59b8f413a9124a7
Signed-off-by: Sachit Kadle <skadle@nvidia.com>
Reviewed-on: http://git-master/r/1255858
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Sachit Kadle
2016-11-17 12:57:56 -08:00
committed by mobile promotions
parent c1064c27df
commit 5277ecd79c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/gk20a/channel_gk20a.c
View File

@@ -1809,8 +1809,10 @@ clean_up_prealloc:
if (args->num_inflight_jobs) if (args->num_inflight_jobs)
channel_gk20a_free_prealloc_resources(c); channel_gk20a_free_prealloc_resources(c);
clean_up_sync: clean_up_sync:
gk20a_channel_sync_destroy(c->sync); if (c->sync) {
c->sync = NULL; gk20a_channel_sync_destroy(c->sync);
c->sync = NULL;
}
clean_up_unmap: clean_up_unmap:
nvgpu_free(c->gpfifo.pipe); nvgpu_free(c->gpfifo.pipe);
gk20a_gmmu_unmap_free(ch_vm, &c->gpfifo.mem); gk20a_gmmu_unmap_free(ch_vm, &c->gpfifo.mem);