diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index f069b193..79aec7a2 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -2216,10 +2216,10 @@ bool gk20a_fifo_handle_sched_error(struct gk20a *g) | |||
2216 | bool verbose = false; | 2216 | bool verbose = false; |
2217 | 2217 | ||
2218 | if (is_tsg) { | 2218 | if (is_tsg) { |
2219 | ret = gk20a_fifo_check_tsg_ctxsw_timeout( | 2219 | ret = g->ops.fifo.check_tsg_ctxsw_timeout( |
2220 | &f->tsg[id], &verbose, &ms); | 2220 | &f->tsg[id], &verbose, &ms); |
2221 | } else { | 2221 | } else { |
2222 | ret = gk20a_fifo_check_ch_ctxsw_timeout( | 2222 | ret = g->ops.fifo.check_ch_ctxsw_timeout( |
2223 | &f->channel[id], &verbose, &ms); | 2223 | &f->channel[id], &verbose, &ms); |
2224 | } | 2224 | } |
2225 | 2225 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 43284ba5..76413600 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -629,6 +629,10 @@ struct gpu_ops { | |||
629 | u32 (*get_preempt_timeout)(struct gk20a *g); | 629 | u32 (*get_preempt_timeout)(struct gk20a *g); |
630 | void (*post_event_id)(struct tsg_gk20a *tsg, int event_id); | 630 | void (*post_event_id)(struct tsg_gk20a *tsg, int event_id); |
631 | void (*ch_abort_clean_up)(struct channel_gk20a *ch); | 631 | void (*ch_abort_clean_up)(struct channel_gk20a *ch); |
632 | bool (*check_tsg_ctxsw_timeout)(struct tsg_gk20a *tsg, | ||
633 | bool *verbose, u32 *ms); | ||
634 | bool (*check_ch_ctxsw_timeout)(struct channel_gk20a *ch, | ||
635 | bool *verbose, u32 *ms); | ||
632 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 636 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
633 | int (*alloc_syncpt_buf)(struct channel_gk20a *c, | 637 | int (*alloc_syncpt_buf)(struct channel_gk20a *c, |
634 | u32 syncpt_id, struct nvgpu_mem *syncpt_buf); | 638 | u32 syncpt_id, struct nvgpu_mem *syncpt_buf); |