From 1586a9f0044987106371255b8133430040ed4f70 Mon Sep 17 00:00:00 2001 From: Alexander Lewkowicz Date: Tue, 19 Sep 2017 13:36:56 -0700 Subject: gpu: nvgpu: gv11b: Fix sm lock down Volta traphandler RM changes Sm lock-down is not being executed correctly. This results in a GPU being in an undefined state. A similar bug fix was already provided on the resman implementation. This fix is inspired by the CL change 21183102. That change refers to bug http://nvbugs/1800484 and bug http://nvbugs/200162542 This patch solves the issues mention in bug http://nvbugs/1992522 Change-Id: I601fef7c94e5ba419d7bf854877fa7a9f9b82cfa Signed-off-by: Alexander Lewkowicz Reviewed-on: https://git-master.nvidia.com/r/1563815 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 50b819ac..74ea0d2c 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c @@ -3136,7 +3136,7 @@ int gv11b_gr_wait_for_sm_lock_down(struct gk20a *g, check_errors && (gr_gpc0_tpc0_sm0_hww_warp_esr_error_v(warp_esr) == gr_gpc0_tpc0_sm0_hww_warp_esr_error_none_v()) && - ((global_esr & ~global_esr_mask) == 0); + ((global_esr & global_esr_mask) == 0); if (locked_down) { /* -- cgit v1.2.2