diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index fac02f68..9061236e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -662,9 +662,9 @@ struct gpu_ops { | |||
662 | struct ch_state *ch_state); | 662 | struct ch_state *ch_state); |
663 | u32 (*intr_0_error_mask)(struct gk20a *g); | 663 | u32 (*intr_0_error_mask)(struct gk20a *g); |
664 | int (*is_preempt_pending)(struct gk20a *g, u32 id, | 664 | int (*is_preempt_pending)(struct gk20a *g, u32 id, |
665 | unsigned int id_type); | 665 | unsigned int id_type, unsigned int timeout_rc_type); |
666 | int (*preempt_ch_tsg)(struct gk20a *g, u32 id, | 666 | int (*preempt_ch_tsg)(struct gk20a *g, u32 id, |
667 | unsigned int id_type); | 667 | unsigned int id_type, unsigned int timeout_rc_type); |
668 | void (*init_pbdma_intr_descs)(struct fifo_gk20a *f); | 668 | void (*init_pbdma_intr_descs)(struct fifo_gk20a *f); |
669 | int (*reset_enable_hw)(struct gk20a *g); | 669 | int (*reset_enable_hw)(struct gk20a *g); |
670 | int (*setup_userd)(struct channel_gk20a *c); | 670 | int (*setup_userd)(struct channel_gk20a *c); |
@@ -1109,7 +1109,7 @@ struct gpu_ops { | |||
1109 | bool (*is_intr_hub_pending)(struct gk20a *g, u32 mc_intr); | 1109 | bool (*is_intr_hub_pending)(struct gk20a *g, u32 mc_intr); |
1110 | bool (*is_intr_nvlink_pending)(struct gk20a *g, u32 mc_intr); | 1110 | bool (*is_intr_nvlink_pending)(struct gk20a *g, u32 mc_intr); |
1111 | bool (*is_stall_and_eng_intr_pending)(struct gk20a *g, | 1111 | bool (*is_stall_and_eng_intr_pending)(struct gk20a *g, |
1112 | u32 act_eng_id, u32 *eng_intr_pending); | 1112 | u32 act_eng_id); |
1113 | u32 (*intr_stall)(struct gk20a *g); | 1113 | u32 (*intr_stall)(struct gk20a *g); |
1114 | void (*intr_stall_pause)(struct gk20a *g); | 1114 | void (*intr_stall_pause)(struct gk20a *g); |
1115 | void (*intr_stall_resume)(struct gk20a *g); | 1115 | void (*intr_stall_resume)(struct gk20a *g); |