diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 40b3bd44..e5d7e83b 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -600,7 +600,7 @@ int gr_gk20a_add_zbc_depth(struct gk20a *g, struct gr_gk20a *gr, | |||
600 | int _gk20a_gr_zbc_set_table(struct gk20a *g, struct gr_gk20a *gr, | 600 | int _gk20a_gr_zbc_set_table(struct gk20a *g, struct gr_gk20a *gr, |
601 | struct zbc_entry *zbc_val); | 601 | struct zbc_entry *zbc_val); |
602 | void gr_gk20a_pmu_save_zbc(struct gk20a *g, u32 entries); | 602 | void gr_gk20a_pmu_save_zbc(struct gk20a *g, u32 entries); |
603 | int gr_gk20a_wait_idle(struct gk20a *g, unsigned long end_jiffies, | 603 | int gr_gk20a_wait_idle(struct gk20a *g, unsigned long duration_ms, |
604 | u32 expect_delay); | 604 | u32 expect_delay); |
605 | int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc, | 605 | int gr_gk20a_handle_sm_exception(struct gk20a *g, u32 gpc, u32 tpc, |
606 | bool *post_event, struct channel_gk20a *fault_ch, | 606 | bool *post_event, struct channel_gk20a *fault_ch, |
@@ -662,8 +662,8 @@ int gr_gk20a_get_ctx_id(struct gk20a *g, | |||
662 | 662 | ||
663 | u32 gk20a_mask_hww_warp_esr(u32 hww_warp_esr); | 663 | u32 gk20a_mask_hww_warp_esr(u32 hww_warp_esr); |
664 | 664 | ||
665 | int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long end_jiffies, | 665 | int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long duration_ms, |
666 | u32 expect_delay); | 666 | u32 expect_delay); |
667 | 667 | ||
668 | bool gr_gk20a_suspend_context(struct channel_gk20a *ch); | 668 | bool gr_gk20a_suspend_context(struct channel_gk20a *ch); |
669 | bool gr_gk20a_resume_context(struct channel_gk20a *ch); | 669 | bool gr_gk20a_resume_context(struct channel_gk20a *ch); |