summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
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/gr_gk20a.h
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/gr_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index c58daefa..ad197228 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -517,7 +517,8 @@ void gk20a_suspend_single_sm(struct gk20a *g,
517void gk20a_suspend_all_sms(struct gk20a *g, 517void gk20a_suspend_all_sms(struct gk20a *g,
518 u32 global_esr_mask, bool check_errors); 518 u32 global_esr_mask, bool check_errors);
519int gk20a_gr_lock_down_sm(struct gk20a *g, 519int gk20a_gr_lock_down_sm(struct gk20a *g,
520 u32 gpc, u32 tpc, u32 global_esr_mask); 520 u32 gpc, u32 tpc, u32 global_esr_mask,
521 bool check_errors);
521int gr_gk20a_set_sm_debug_mode(struct gk20a *g, 522int gr_gk20a_set_sm_debug_mode(struct gk20a *g,
522 struct channel_gk20a *ch, u64 sms, bool enable); 523 struct channel_gk20a *ch, u64 sms, bool enable);
523bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch); 524bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch);