diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index 2d1c9cc3..12970558 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -268,8 +268,8 @@ void gk20a_fifo_recover(struct gk20a *g, | |||
268 | bool id_is_known, bool verbose, int rc_type); | 268 | bool id_is_known, bool verbose, int rc_type); |
269 | void gk20a_fifo_recover_ch(struct gk20a *g, u32 chid, bool verbose, | 269 | void gk20a_fifo_recover_ch(struct gk20a *g, u32 chid, bool verbose, |
270 | int rc_type); | 270 | int rc_type); |
271 | void gk20a_fifo_recover_tsg(struct gk20a *g, u32 tsgid, bool verbose, | 271 | void gk20a_fifo_recover_tsg(struct gk20a *g, struct tsg_gk20a *tsg, |
272 | int rc_type); | 272 | bool verbose, u32 rc_type); |
273 | int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, | 273 | int gk20a_fifo_force_reset_ch(struct channel_gk20a *ch, |
274 | u32 err_code, bool verbose); | 274 | u32 err_code, bool verbose); |
275 | void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id); | 275 | void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id); |
@@ -390,8 +390,8 @@ u32 gk20a_fifo_intr_0_error_mask(struct gk20a *g); | |||
390 | int gk20a_fifo_is_preempt_pending(struct gk20a *g, u32 id, | 390 | int gk20a_fifo_is_preempt_pending(struct gk20a *g, u32 id, |
391 | unsigned int id_type); | 391 | unsigned int id_type); |
392 | int __locked_fifo_preempt(struct gk20a *g, u32 id, bool is_tsg); | 392 | int __locked_fifo_preempt(struct gk20a *g, u32 id, bool is_tsg); |
393 | void gk20a_fifo_preempt_timeout_rc(struct gk20a *g, u32 id, | 393 | void gk20a_fifo_preempt_timeout_rc_tsg(struct gk20a *g, struct tsg_gk20a *tsg); |
394 | unsigned int id_type); | 394 | void gk20a_fifo_preempt_timeout_rc(struct gk20a *g, u32 chid); |
395 | int gk20a_fifo_setup_ramfc(struct channel_gk20a *c, | 395 | int gk20a_fifo_setup_ramfc(struct channel_gk20a *c, |
396 | u64 gpfifo_base, u32 gpfifo_entries, | 396 | u64 gpfifo_base, u32 gpfifo_entries, |
397 | unsigned long timeout, u32 flags); | 397 | unsigned long timeout, u32 flags); |