diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 2dd18370..e5ccfcb4 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
| @@ -3528,7 +3528,7 @@ int gk20a_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id, | |||
| 3528 | return 0; | 3528 | return 0; |
| 3529 | } | 3529 | } |
| 3530 | if (tsg && ++tsg->num_active_channels) { | 3530 | if (tsg && ++tsg->num_active_channels) { |
| 3531 | set_bit(f->channel[chid].tsgid, | 3531 | set_bit((int)f->channel[chid].tsgid, |
| 3532 | runlist->active_tsgs); | 3532 | runlist->active_tsgs); |
| 3533 | } | 3533 | } |
| 3534 | } else { | 3534 | } else { |
| @@ -3537,7 +3537,7 @@ int gk20a_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id, | |||
| 3537 | return 0; | 3537 | return 0; |
| 3538 | } | 3538 | } |
| 3539 | if (tsg && --tsg->num_active_channels == 0) { | 3539 | if (tsg && --tsg->num_active_channels == 0) { |
| 3540 | clear_bit(f->channel[chid].tsgid, | 3540 | clear_bit((int)f->channel[chid].tsgid, |
| 3541 | runlist->active_tsgs); | 3541 | runlist->active_tsgs); |
| 3542 | } | 3542 | } |
| 3543 | } | 3543 | } |
| @@ -3642,7 +3642,7 @@ static int __locked_fifo_reschedule_preempt_next(struct channel_gk20a *ch, | |||
| 3642 | int ret = 0; | 3642 | int ret = 0; |
| 3643 | u32 gr_eng_id = 0; | 3643 | u32 gr_eng_id = 0; |
| 3644 | u32 engstat = 0, ctxstat = 0, fecsstat0 = 0, fecsstat1 = 0; | 3644 | u32 engstat = 0, ctxstat = 0, fecsstat0 = 0, fecsstat1 = 0; |
| 3645 | s32 preempt_id = -1; | 3645 | u32 preempt_id; |
| 3646 | u32 preempt_type = 0; | 3646 | u32 preempt_type = 0; |
| 3647 | 3647 | ||
| 3648 | if (1 != gk20a_fifo_get_engine_ids( | 3648 | if (1 != gk20a_fifo_get_engine_ids( |