diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/fifo_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index 9be29f45..d8976608 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -817,7 +817,7 @@ int gv11b_fifo_preempt_tsg(struct gk20a *g, u32 tsgid) | |||
817 | runlist_id = f->tsg[tsgid].runlist_id; | 817 | runlist_id = f->tsg[tsgid].runlist_id; |
818 | gk20a_dbg_fn("runlist_id %d", runlist_id); | 818 | gk20a_dbg_fn("runlist_id %d", runlist_id); |
819 | 819 | ||
820 | nvgpu_mutex_acquire(&f->runlist_info[runlist_id].mutex); | 820 | nvgpu_mutex_acquire(&f->runlist_info[runlist_id].runlist_lock); |
821 | 821 | ||
822 | mutex_ret = nvgpu_pmu_mutex_acquire(&g->pmu, PMU_MUTEX_ID_FIFO, &token); | 822 | mutex_ret = nvgpu_pmu_mutex_acquire(&g->pmu, PMU_MUTEX_ID_FIFO, &token); |
823 | 823 | ||
@@ -826,7 +826,7 @@ int gv11b_fifo_preempt_tsg(struct gk20a *g, u32 tsgid) | |||
826 | if (!mutex_ret) | 826 | if (!mutex_ret) |
827 | nvgpu_pmu_mutex_release(&g->pmu, PMU_MUTEX_ID_FIFO, &token); | 827 | nvgpu_pmu_mutex_release(&g->pmu, PMU_MUTEX_ID_FIFO, &token); |
828 | 828 | ||
829 | nvgpu_mutex_release(&f->runlist_info[runlist_id].mutex); | 829 | nvgpu_mutex_release(&f->runlist_info[runlist_id].runlist_lock); |
830 | 830 | ||
831 | return ret; | 831 | return ret; |
832 | } | 832 | } |
@@ -844,7 +844,7 @@ static int gv11b_fifo_preempt_runlists(struct gk20a *g, u32 runlists_mask) | |||
844 | for (runlist_id = 0; runlist_id < g->fifo.max_runlists; runlist_id++) { | 844 | for (runlist_id = 0; runlist_id < g->fifo.max_runlists; runlist_id++) { |
845 | if (runlists_mask & fifo_runlist_preempt_runlist_m(runlist_id)) | 845 | if (runlists_mask & fifo_runlist_preempt_runlist_m(runlist_id)) |
846 | nvgpu_mutex_acquire(&g->fifo. | 846 | nvgpu_mutex_acquire(&g->fifo. |
847 | runlist_info[runlist_id].mutex); | 847 | runlist_info[runlist_id].runlist_lock); |
848 | } | 848 | } |
849 | 849 | ||
850 | mutex_ret = nvgpu_pmu_mutex_acquire(&g->pmu, PMU_MUTEX_ID_FIFO, &token); | 850 | mutex_ret = nvgpu_pmu_mutex_acquire(&g->pmu, PMU_MUTEX_ID_FIFO, &token); |
@@ -861,7 +861,7 @@ static int gv11b_fifo_preempt_runlists(struct gk20a *g, u32 runlists_mask) | |||
861 | g->fifo.runlist_info[runlist_id].reset_eng_bitmask = | 861 | g->fifo.runlist_info[runlist_id].reset_eng_bitmask = |
862 | g->fifo.runlist_info[runlist_id].eng_bitmask; | 862 | g->fifo.runlist_info[runlist_id].eng_bitmask; |
863 | nvgpu_mutex_release(&g->fifo. | 863 | nvgpu_mutex_release(&g->fifo. |
864 | runlist_info[runlist_id].mutex); | 864 | runlist_info[runlist_id].runlist_lock); |
865 | } | 865 | } |
866 | } | 866 | } |
867 | 867 | ||
@@ -916,7 +916,7 @@ int gv11b_fifo_preempt_ch_tsg(struct gk20a *g, u32 id, | |||
916 | 916 | ||
917 | gk20a_dbg_fn("preempt id = %d, runlist_id = %d", id, runlist_id); | 917 | gk20a_dbg_fn("preempt id = %d, runlist_id = %d", id, runlist_id); |
918 | 918 | ||
919 | nvgpu_mutex_acquire(&f->runlist_info[runlist_id].mutex); | 919 | nvgpu_mutex_acquire(&f->runlist_info[runlist_id].runlist_lock); |
920 | 920 | ||
921 | mutex_ret = nvgpu_pmu_mutex_acquire(&g->pmu, PMU_MUTEX_ID_FIFO, &token); | 921 | mutex_ret = nvgpu_pmu_mutex_acquire(&g->pmu, PMU_MUTEX_ID_FIFO, &token); |
922 | 922 | ||
@@ -925,7 +925,7 @@ int gv11b_fifo_preempt_ch_tsg(struct gk20a *g, u32 id, | |||
925 | if (!mutex_ret) | 925 | if (!mutex_ret) |
926 | nvgpu_pmu_mutex_release(&g->pmu, PMU_MUTEX_ID_FIFO, &token); | 926 | nvgpu_pmu_mutex_release(&g->pmu, PMU_MUTEX_ID_FIFO, &token); |
927 | 927 | ||
928 | nvgpu_mutex_release(&f->runlist_info[runlist_id].mutex); | 928 | nvgpu_mutex_release(&f->runlist_info[runlist_id].runlist_lock); |
929 | 929 | ||
930 | return ret; | 930 | return ret; |
931 | 931 | ||