diff options
author | Seema Khowala <seemaj@nvidia.com> | 2019-01-18 17:15:57 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2019-04-16 06:57:43 -0400 |
commit | 9bde6f8950c7f19f60d1e907e2458b965d35b8ff (patch) | |
tree | 346afa53b46ab247093cdfa59b2f3caa43598eb4 /drivers/gpu/nvgpu/gv11b | |
parent | 3a11883f7f4399ae8dffbea00c1842e3c2095937 (diff) |
gpu: nvgpu: gv11b: add missing tsg_mark_error
nvgpu_tsg_mark_error is missing in teardown path for aborting tsg.
Without this, channels corresponding to tsg being aborted will not be
set to timedout (unserviceable) and also notifier_wq and semaphore_wq
will not be woken up.
Bug 2092051
Bug 2429295
Bug 2484211
Change-Id: Ie71c9a3b7a7fd1aa8cb9ec5d0dc30ccaeadfeae5
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1999026
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
(cherry picked from commit 7fed0c19379139081162536ead3682ab747775db
in dev-kernel)
Reviewed-on: https://git-master.nvidia.com/r/2086594
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index 8b5eef82..b5af2972 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -1180,7 +1180,7 @@ void gv11b_fifo_teardown_ch_tsg(struct gk20a *g, u32 act_eng_bitmask, | |||
1180 | if (rc_type == RC_TYPE_MMU_FAULT) { | 1180 | if (rc_type == RC_TYPE_MMU_FAULT) { |
1181 | gk20a_fifo_set_ctx_mmu_error_tsg(g, tsg); | 1181 | gk20a_fifo_set_ctx_mmu_error_tsg(g, tsg); |
1182 | } | 1182 | } |
1183 | 1183 | (void)gk20a_fifo_error_tsg(g, tsg); | |
1184 | gk20a_fifo_abort_tsg(g, tsg, false); | 1184 | gk20a_fifo_abort_tsg(g, tsg, false); |
1185 | } | 1185 | } |
1186 | } else { | 1186 | } else { |