diff options
author | Seema Khowala <seemaj@nvidia.com> | 2018-05-07 15:06:08 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-06-24 12:53:33 -0400 |
commit | 067ddbc4e4df3f1f756f03e7865c369a46f420aa (patch) | |
tree | c3de983f555152fedc3df2107bbae414bd119351 /drivers/gpu/nvgpu/gv11b/fifo_gv11b.h | |
parent | 3eede64de058fcb1e39d723dd146bcd5d06c6f43 (diff) |
gpu: nvgpu: remove timeout_rc_type i/p param
-is_preempt_pending hal does not need timeout_rc_type input param as
for volta, reset_eng_bitmask is saved if preempt times out. For
legacy chips, recovery triggers mmu fault and mmu fault handler
takes care of resetting engines.
-For volta, no special input param needed to differentiate between
preempt polling during normal scenario and preempt polling during
recovery. Recovery path uses preempt_ch_tsg hal to issue preempt.
This hal does not issue recovery if preempt times out.
Bug 2125776
Bug 2108544
Bug 2105322
Bug 2092051
Bug 2048824
Bug 2043838
Bug 2039587
Bug 2028993
Bug 2029245
Bug 2065990
Bug 1945121
Bug 200401707
Bug 200393631
Bug 200327596
Change-Id: Ie76a18ae0be880cfbeee615859a08179fb974fa8
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1709799
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/fifo_gv11b.h')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h index 66efdd3b..3dfc337c 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.h | |||
@@ -81,12 +81,11 @@ void gv11b_dump_eng_status(struct gk20a *g, | |||
81 | u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g); | 81 | u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g); |
82 | int gv11b_fifo_reschedule_runlist(struct channel_gk20a *ch, bool preempt_next); | 82 | int gv11b_fifo_reschedule_runlist(struct channel_gk20a *ch, bool preempt_next); |
83 | int gv11b_fifo_is_preempt_pending(struct gk20a *g, u32 id, | 83 | int gv11b_fifo_is_preempt_pending(struct gk20a *g, u32 id, |
84 | unsigned int id_type, unsigned int timeout_rc_type); | 84 | unsigned int id_type); |
85 | int gv11b_fifo_preempt_channel(struct gk20a *g, u32 chid); | 85 | int gv11b_fifo_preempt_channel(struct gk20a *g, u32 chid); |
86 | int gv11b_fifo_preempt_tsg(struct gk20a *g, u32 tsgid); | 86 | int gv11b_fifo_preempt_tsg(struct gk20a *g, u32 tsgid); |
87 | int gv11b_fifo_enable_tsg(struct tsg_gk20a *tsg); | 87 | int gv11b_fifo_enable_tsg(struct tsg_gk20a *tsg); |
88 | int gv11b_fifo_preempt_ch_tsg(struct gk20a *g, u32 id, | 88 | int gv11b_fifo_preempt_ch_tsg(struct gk20a *g, u32 id, unsigned int id_type); |
89 | unsigned int id_type, unsigned int timeout_rc_type); | ||
90 | void gv11b_fifo_teardown_ch_tsg(struct gk20a *g, u32 act_eng_bitmask, | 89 | void gv11b_fifo_teardown_ch_tsg(struct gk20a *g, u32 act_eng_bitmask, |
91 | u32 id, unsigned int id_type, unsigned int rc_type, | 90 | u32 id, unsigned int id_type, unsigned int rc_type, |
92 | struct mmu_fault_info *mmfault); | 91 | struct mmu_fault_info *mmfault); |