diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-06-22 14:53:04 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-07-06 15:04:43 -0400 |
commit | 0852c9f1aba1654e380ccdd13cd0540fbb5a8ab0 (patch) | |
tree | 7f5a797567b0c76f89b8e8241f794b432129d8bc /drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |
parent | 4728761b6cd002404b9ccd8b318cc9f772962efb (diff) |
gpu: nvgpu: add sm lock_down gr ops
Add lock_down_sm and wait_for_sm_lock_down gr ops
Required to support multiple SM and t19x SM register
address changes
JIRA GPUT19X-75
Change-Id: I529babde51d9b2143fe3740a4f67c582b7eb404b
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master/r/1514042
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.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 8230ba72..77db5cf6 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -622,9 +622,6 @@ void gk20a_gr_suspend_single_sm(struct gk20a *g, | |||
622 | void gk20a_gr_suspend_all_sms(struct gk20a *g, | 622 | void gk20a_gr_suspend_all_sms(struct gk20a *g, |
623 | u32 global_esr_mask, bool check_errors); | 623 | u32 global_esr_mask, bool check_errors); |
624 | u32 gr_gk20a_get_tpc_count(struct gr_gk20a *gr, u32 gpc_index); | 624 | u32 gr_gk20a_get_tpc_count(struct gr_gk20a *gr, u32 gpc_index); |
625 | int gk20a_gr_lock_down_sm(struct gk20a *g, | ||
626 | u32 gpc, u32 tpc, u32 global_esr_mask, | ||
627 | bool check_errors); | ||
628 | int gr_gk20a_set_sm_debug_mode(struct gk20a *g, | 625 | int gr_gk20a_set_sm_debug_mode(struct gk20a *g, |
629 | struct channel_gk20a *ch, u64 sms, bool enable); | 626 | struct channel_gk20a *ch, u64 sms, bool enable); |
630 | bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch); | 627 | bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch); |
@@ -681,7 +678,10 @@ static inline void gr_gk20a_free_cyclestats_snapshot_data(struct gk20a *g) | |||
681 | 678 | ||
682 | int gk20a_gr_handle_fecs_error(struct gk20a *g, struct channel_gk20a *ch, | 679 | int gk20a_gr_handle_fecs_error(struct gk20a *g, struct channel_gk20a *ch, |
683 | struct gr_gk20a_isr_data *isr_data); | 680 | struct gr_gk20a_isr_data *isr_data); |
684 | int gk20a_gr_wait_for_sm_lock_down(struct gk20a *g, u32 gpc, u32 tpc, | 681 | int gk20a_gr_lock_down_sm(struct gk20a *g, |
682 | u32 gpc, u32 tpc, u32 sm, u32 global_esr_mask, | ||
683 | bool check_errors); | ||
684 | int gk20a_gr_wait_for_sm_lock_down(struct gk20a *g, u32 gpc, u32 tpc, u32 sm, | ||
685 | u32 global_esr_mask, bool check_errors); | 685 | u32 global_esr_mask, bool check_errors); |
686 | void gk20a_gr_clear_sm_hww(struct gk20a *g, | 686 | void gk20a_gr_clear_sm_hww(struct gk20a *g, |
687 | u32 gpc, u32 tpc, u32 global_esr); | 687 | u32 gpc, u32 tpc, u32 global_esr); |