summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
diff options
context:
space:
mode:
authorAshutosh Jain <ashutoshj@nvidia.com>2016-01-20 09:36:23 -0500
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-01-29 11:59:07 -0500
commit5cb995c7510e0290956a3aa221c6a77d4020b3ff (patch)
tree70eb5fcf27482e72118ec27437698a4973c748b2 /drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
parent766506d6e0d406ac312b75f709abfdb9d8ae2b2a (diff)
gpu: nvgpu: Fix wait for sm lock down.
global_esr and warp_esr are edge-triggered and are cleared in kernel isr so skip checking them when wait_for_pause is called from UMD via ioctl. Bug 1619430 Change-Id: I2ae54f23ba5c8bfaab35a476f88ccca0bbb10202 Signed-off-by: Ashutosh Jain <ashutoshj@nvidia.com> Reviewed-on: http://git-master/r/935808 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Cory Perry <cperry@nvidia.com> Tested-by: Cory Perry <cperry@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
index 536f00e0..9ed5fef3 100644
--- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2011-2015, NVIDIA Corporation. All rights reserved. 2 * Copyright (c) 2011-2016, NVIDIA Corporation. All rights reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms and conditions of the GNU General Public License, 5 * under the terms and conditions of the GNU General Public License,
@@ -397,7 +397,7 @@ static int nvgpu_gpu_ioctl_wait_for_pause(struct gk20a *g,
397 gpc = g->gr.sm_to_cluster[sm_id].gpc_index; 397 gpc = g->gr.sm_to_cluster[sm_id].gpc_index;
398 tpc = g->gr.sm_to_cluster[sm_id].tpc_index; 398 tpc = g->gr.sm_to_cluster[sm_id].tpc_index;
399 399
400 err = gk20a_gr_lock_down_sm(g, gpc, tpc, global_mask); 400 err = gk20a_gr_lock_down_sm(g, gpc, tpc, global_mask, false);
401 401
402 if (err) { 402 if (err) {
403 gk20a_err(dev_from_gk20a(g), "sm did not lock down!\n"); 403 gk20a_err(dev_from_gk20a(g), "sm did not lock down!\n");