From 9bde6f8950c7f19f60d1e907e2458b965d35b8ff Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Fri, 18 Jan 2019 14:15:57 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1999026 Signed-off-by: Debarshi Dutta (cherry picked from commit 7fed0c19379139081162536ead3682ab747775db in dev-kernel) Reviewed-on: https://git-master.nvidia.com/r/2086594 Reviewed-by: Bibek Basu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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, if (rc_type == RC_TYPE_MMU_FAULT) { gk20a_fifo_set_ctx_mmu_error_tsg(g, tsg); } - + (void)gk20a_fifo_error_tsg(g, tsg); gk20a_fifo_abort_tsg(g, tsg, false); } } else { -- cgit v1.2.2