diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 00119300..c8789c3a 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -2704,7 +2704,7 @@ void gk20a_fifo_issue_preempt(struct gk20a *g, u32 id, bool is_tsg) | |||
2704 | } | 2704 | } |
2705 | 2705 | ||
2706 | int gk20a_fifo_is_preempt_pending(struct gk20a *g, u32 id, | 2706 | int gk20a_fifo_is_preempt_pending(struct gk20a *g, u32 id, |
2707 | unsigned int id_type, unsigned int timeout_rc_type) | 2707 | unsigned int id_type) |
2708 | { | 2708 | { |
2709 | struct nvgpu_timeout timeout; | 2709 | struct nvgpu_timeout timeout; |
2710 | u32 delay = GR_IDLE_CHECK_DEFAULT; | 2710 | u32 delay = GR_IDLE_CHECK_DEFAULT; |
@@ -2777,8 +2777,8 @@ int __locked_fifo_preempt(struct gk20a *g, u32 id, bool is_tsg) | |||
2777 | id_type = is_tsg ? ID_TYPE_TSG : ID_TYPE_CHANNEL; | 2777 | id_type = is_tsg ? ID_TYPE_TSG : ID_TYPE_CHANNEL; |
2778 | 2778 | ||
2779 | /* wait for preempt */ | 2779 | /* wait for preempt */ |
2780 | ret = g->ops.fifo.is_preempt_pending(g, id, id_type, | 2780 | ret = g->ops.fifo.is_preempt_pending(g, id, id_type); |
2781 | PREEMPT_TIMEOUT_RC); | 2781 | |
2782 | return ret; | 2782 | return ret; |
2783 | } | 2783 | } |
2784 | 2784 | ||
@@ -3448,8 +3448,7 @@ static int __locked_fifo_reschedule_preempt_next(struct channel_gk20a *ch, | |||
3448 | gk20a_readl(g, fifo_preempt_r())); | 3448 | gk20a_readl(g, fifo_preempt_r())); |
3449 | #endif | 3449 | #endif |
3450 | if (wait_preempt) { | 3450 | if (wait_preempt) { |
3451 | g->ops.fifo.is_preempt_pending( | 3451 | g->ops.fifo.is_preempt_pending(g, preempt_id, preempt_type); |
3452 | g, preempt_id, preempt_type, PREEMPT_TIMEOUT_RC); | ||
3453 | } | 3452 | } |
3454 | #ifdef TRACEPOINTS_ENABLED | 3453 | #ifdef TRACEPOINTS_ENABLED |
3455 | trace_gk20a_reschedule_preempted_next(ch->chid); | 3454 | trace_gk20a_reschedule_preempted_next(ch->chid); |