diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index c502add5..5b27953e 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |||
@@ -618,7 +618,8 @@ int gk20a_ce_execute_ops(struct device *dev, | |||
618 | memcpy((void *)&ce_cmd_buf_fence_in, | 618 | memcpy((void *)&ce_cmd_buf_fence_in, |
619 | (void *)(cmd_buf_cpu_va + fence_index), | 619 | (void *)(cmd_buf_cpu_va + fence_index), |
620 | sizeof(struct gk20a_fence *)); | 620 | sizeof(struct gk20a_fence *)); |
621 | ret = gk20a_fence_wait(ce_cmd_buf_fence_in, gk20a_get_gr_idle_timeout(g)); | 621 | ret = gk20a_fence_wait(g, ce_cmd_buf_fence_in, |
622 | gk20a_get_gr_idle_timeout(g)); | ||
622 | 623 | ||
623 | gk20a_fence_put(ce_cmd_buf_fence_in); | 624 | gk20a_fence_put(ce_cmd_buf_fence_in); |
624 | /* Reset the stored last pre-sync */ | 625 | /* Reset the stored last pre-sync */ |
@@ -645,7 +646,8 @@ int gk20a_ce_execute_ops(struct device *dev, | |||
645 | if (methodSize) { | 646 | if (methodSize) { |
646 | /* TODO: Remove CPU pre-fence wait */ | 647 | /* TODO: Remove CPU pre-fence wait */ |
647 | if (gk20a_fence_in) { | 648 | if (gk20a_fence_in) { |
648 | ret = gk20a_fence_wait(gk20a_fence_in, gk20a_get_gr_idle_timeout(g)); | 649 | ret = gk20a_fence_wait(g, gk20a_fence_in, |
650 | gk20a_get_gr_idle_timeout(g)); | ||
649 | gk20a_fence_put(gk20a_fence_in); | 651 | gk20a_fence_put(gk20a_fence_in); |
650 | if (ret) | 652 | if (ret) |
651 | goto noop; | 653 | goto noop; |