diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index e7bcf6f0..5ffa3e2f 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -2283,9 +2283,9 @@ int gk20a_mm_fb_flush(struct gk20a *g) | |||
2283 | 2283 | ||
2284 | gk20a_dbg_fn(""); | 2284 | gk20a_dbg_fn(""); |
2285 | 2285 | ||
2286 | gk20a_busy_noresume(g->dev); | 2286 | gk20a_busy_noresume(g); |
2287 | if (!g->power_on) { | 2287 | if (!g->power_on) { |
2288 | gk20a_idle_nosuspend(g->dev); | 2288 | gk20a_idle_nosuspend(g); |
2289 | return 0; | 2289 | return 0; |
2290 | } | 2290 | } |
2291 | 2291 | ||
@@ -2325,7 +2325,7 @@ int gk20a_mm_fb_flush(struct gk20a *g) | |||
2325 | 2325 | ||
2326 | nvgpu_mutex_release(&mm->l2_op_lock); | 2326 | nvgpu_mutex_release(&mm->l2_op_lock); |
2327 | 2327 | ||
2328 | gk20a_idle_nosuspend(g->dev); | 2328 | gk20a_idle_nosuspend(g); |
2329 | 2329 | ||
2330 | return ret; | 2330 | return ret; |
2331 | } | 2331 | } |
@@ -2367,13 +2367,13 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) | |||
2367 | void gk20a_mm_l2_invalidate(struct gk20a *g) | 2367 | void gk20a_mm_l2_invalidate(struct gk20a *g) |
2368 | { | 2368 | { |
2369 | struct mm_gk20a *mm = &g->mm; | 2369 | struct mm_gk20a *mm = &g->mm; |
2370 | gk20a_busy_noresume(g->dev); | 2370 | gk20a_busy_noresume(g); |
2371 | if (g->power_on) { | 2371 | if (g->power_on) { |
2372 | nvgpu_mutex_acquire(&mm->l2_op_lock); | 2372 | nvgpu_mutex_acquire(&mm->l2_op_lock); |
2373 | gk20a_mm_l2_invalidate_locked(g); | 2373 | gk20a_mm_l2_invalidate_locked(g); |
2374 | nvgpu_mutex_release(&mm->l2_op_lock); | 2374 | nvgpu_mutex_release(&mm->l2_op_lock); |
2375 | } | 2375 | } |
2376 | gk20a_idle_nosuspend(g->dev); | 2376 | gk20a_idle_nosuspend(g); |
2377 | } | 2377 | } |
2378 | 2378 | ||
2379 | void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | 2379 | void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) |
@@ -2384,7 +2384,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | |||
2384 | 2384 | ||
2385 | gk20a_dbg_fn(""); | 2385 | gk20a_dbg_fn(""); |
2386 | 2386 | ||
2387 | gk20a_busy_noresume(g->dev); | 2387 | gk20a_busy_noresume(g); |
2388 | if (!g->power_on) | 2388 | if (!g->power_on) |
2389 | goto hw_was_off; | 2389 | goto hw_was_off; |
2390 | 2390 | ||
@@ -2421,7 +2421,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | |||
2421 | nvgpu_mutex_release(&mm->l2_op_lock); | 2421 | nvgpu_mutex_release(&mm->l2_op_lock); |
2422 | 2422 | ||
2423 | hw_was_off: | 2423 | hw_was_off: |
2424 | gk20a_idle_nosuspend(g->dev); | 2424 | gk20a_idle_nosuspend(g); |
2425 | } | 2425 | } |
2426 | 2426 | ||
2427 | void gk20a_mm_cbc_clean(struct gk20a *g) | 2427 | void gk20a_mm_cbc_clean(struct gk20a *g) |
@@ -2432,7 +2432,7 @@ void gk20a_mm_cbc_clean(struct gk20a *g) | |||
2432 | 2432 | ||
2433 | gk20a_dbg_fn(""); | 2433 | gk20a_dbg_fn(""); |
2434 | 2434 | ||
2435 | gk20a_busy_noresume(g->dev); | 2435 | gk20a_busy_noresume(g); |
2436 | if (!g->power_on) | 2436 | if (!g->power_on) |
2437 | goto hw_was_off; | 2437 | goto hw_was_off; |
2438 | 2438 | ||
@@ -2461,7 +2461,7 @@ void gk20a_mm_cbc_clean(struct gk20a *g) | |||
2461 | nvgpu_mutex_release(&mm->l2_op_lock); | 2461 | nvgpu_mutex_release(&mm->l2_op_lock); |
2462 | 2462 | ||
2463 | hw_was_off: | 2463 | hw_was_off: |
2464 | gk20a_idle_nosuspend(g->dev); | 2464 | gk20a_idle_nosuspend(g); |
2465 | } | 2465 | } |
2466 | 2466 | ||
2467 | int nvgpu_vm_find_buf(struct vm_gk20a *vm, u64 gpu_va, | 2467 | int nvgpu_vm_find_buf(struct vm_gk20a *vm, u64 gpu_va, |