diff options
author | Aingara Paramakuru <aparamakuru@nvidia.com> | 2016-05-27 15:31:48 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-31 15:26:32 -0400 |
commit | e8fd660ab98a05cdb5195954eb171dbaef02b83e (patch) | |
tree | bed666812ee9cf35d79b911539a0ba40db9c2a1c /drivers/gpu | |
parent | 97a58123e89882d2584f34fba57b7cfde387b333 (diff) |
gpu: nvgpu: fix bug in CHANNEL_FORCE_RESET
Channels belonging to a TSG did not have their error notifier
set correctly. This was due to using an incorrect TSG id.
Bug 1617046
Change-Id: Icb6911c7d79a9d02d7713bb47a7cbb24c3098dc1
Signed-off-by: Aingara Paramakuru <aparamakuru@nvidia.com>
Reviewed-on: http://git-master/r/1155293
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 134a2480..2f7cb888 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -1419,7 +1419,7 @@ int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, bool verbose) | |||
1419 | struct gk20a *g = ch->g; | 1419 | struct gk20a *g = ch->g; |
1420 | 1420 | ||
1421 | if (gk20a_is_channel_marked_as_tsg(ch)) { | 1421 | if (gk20a_is_channel_marked_as_tsg(ch)) { |
1422 | tsg = &g->fifo.tsg[ch->hw_chid]; | 1422 | tsg = &g->fifo.tsg[ch->tsgid]; |
1423 | 1423 | ||
1424 | mutex_lock(&tsg->ch_list_lock); | 1424 | mutex_lock(&tsg->ch_list_lock); |
1425 | 1425 | ||