diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 18 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 8ac6d1d1..792fa098 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -5049,9 +5049,9 @@ int gk20a_mm_fb_flush(struct gk20a *g) | |||
5049 | udelay(5); | 5049 | udelay(5); |
5050 | } else | 5050 | } else |
5051 | break; | 5051 | break; |
5052 | } while (!nvgpu_timeout_check(&timeout)); | 5052 | } while (!nvgpu_timeout_expired(&timeout)); |
5053 | 5053 | ||
5054 | if (nvgpu_timeout_peek(&timeout)) { | 5054 | if (nvgpu_timeout_peek_expired(&timeout)) { |
5055 | if (g->ops.fb.dump_vpr_wpr_info) | 5055 | if (g->ops.fb.dump_vpr_wpr_info) |
5056 | g->ops.fb.dump_vpr_wpr_info(g); | 5056 | g->ops.fb.dump_vpr_wpr_info(g); |
5057 | ret = -EBUSY; | 5057 | ret = -EBUSY; |
@@ -5092,9 +5092,9 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) | |||
5092 | udelay(5); | 5092 | udelay(5); |
5093 | } else | 5093 | } else |
5094 | break; | 5094 | break; |
5095 | } while (!nvgpu_timeout_check(&timeout)); | 5095 | } while (!nvgpu_timeout_expired(&timeout)); |
5096 | 5096 | ||
5097 | if (nvgpu_timeout_peek(&timeout)) | 5097 | if (nvgpu_timeout_peek_expired(&timeout)) |
5098 | gk20a_warn(dev_from_gk20a(g), | 5098 | gk20a_warn(dev_from_gk20a(g), |
5099 | "l2_system_invalidate too many retries"); | 5099 | "l2_system_invalidate too many retries"); |
5100 | 5100 | ||
@@ -5147,7 +5147,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | |||
5147 | udelay(5); | 5147 | udelay(5); |
5148 | } else | 5148 | } else |
5149 | break; | 5149 | break; |
5150 | } while (!nvgpu_timeout_check_msg(&timeout, | 5150 | } while (!nvgpu_timeout_expired_msg(&timeout, |
5151 | "l2_flush_dirty too many retries")); | 5151 | "l2_flush_dirty too many retries")); |
5152 | 5152 | ||
5153 | trace_gk20a_mm_l2_flush_done(dev_name(g->dev)); | 5153 | trace_gk20a_mm_l2_flush_done(dev_name(g->dev)); |
@@ -5192,7 +5192,7 @@ void gk20a_mm_cbc_clean(struct gk20a *g) | |||
5192 | udelay(5); | 5192 | udelay(5); |
5193 | } else | 5193 | } else |
5194 | break; | 5194 | break; |
5195 | } while (!nvgpu_timeout_check_msg(&timeout, | 5195 | } while (!nvgpu_timeout_expired_msg(&timeout, |
5196 | "l2_clean_comptags too many retries")); | 5196 | "l2_clean_comptags too many retries")); |
5197 | 5197 | ||
5198 | mutex_unlock(&mm->l2_op_lock); | 5198 | mutex_unlock(&mm->l2_op_lock); |
@@ -5259,10 +5259,10 @@ void gk20a_mm_tlb_invalidate(struct vm_gk20a *vm) | |||
5259 | if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) | 5259 | if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) |
5260 | break; | 5260 | break; |
5261 | udelay(2); | 5261 | udelay(2); |
5262 | } while (!nvgpu_timeout_check_msg(&timeout, | 5262 | } while (!nvgpu_timeout_expired_msg(&timeout, |
5263 | "wait mmu fifo space")); | 5263 | "wait mmu fifo space")); |
5264 | 5264 | ||
5265 | if (nvgpu_timeout_peek(&timeout)) | 5265 | if (nvgpu_timeout_peek_expired(&timeout)) |
5266 | goto out; | 5266 | goto out; |
5267 | 5267 | ||
5268 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | 5268 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); |
@@ -5283,7 +5283,7 @@ void gk20a_mm_tlb_invalidate(struct vm_gk20a *vm) | |||
5283 | fb_mmu_ctrl_pri_fifo_empty_false_f()) | 5283 | fb_mmu_ctrl_pri_fifo_empty_false_f()) |
5284 | break; | 5284 | break; |
5285 | udelay(2); | 5285 | udelay(2); |
5286 | } while (!nvgpu_timeout_check_msg(&timeout, | 5286 | } while (!nvgpu_timeout_expired_msg(&timeout, |
5287 | "wait mmu invalidate")); | 5287 | "wait mmu invalidate")); |
5288 | 5288 | ||
5289 | trace_gk20a_mm_tlb_invalidate_done(dev_name(g->dev)); | 5289 | trace_gk20a_mm_tlb_invalidate_done(dev_name(g->dev)); |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 1d580dae..853011f2 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -2129,7 +2129,7 @@ int pmu_idle(struct pmu_gk20a *pmu) | |||
2129 | break; | 2129 | break; |
2130 | } | 2130 | } |
2131 | 2131 | ||
2132 | if (nvgpu_timeout_check_msg(&timeout, | 2132 | if (nvgpu_timeout_expired_msg(&timeout, |
2133 | "waiting for pmu idle: 0x%08x", | 2133 | "waiting for pmu idle: 0x%08x", |
2134 | idle_stat)) | 2134 | idle_stat)) |
2135 | return -EBUSY; | 2135 | return -EBUSY; |
@@ -4058,7 +4058,7 @@ int pmu_wait_message_cond(struct pmu_gk20a *pmu, u32 timeout_ms, | |||
4058 | 4058 | ||
4059 | usleep_range(delay, delay * 2); | 4059 | usleep_range(delay, delay * 2); |
4060 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); | 4060 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); |
4061 | } while (!nvgpu_timeout_check(&timeout)); | 4061 | } while (!nvgpu_timeout_expired(&timeout)); |
4062 | 4062 | ||
4063 | return -ETIMEDOUT; | 4063 | return -ETIMEDOUT; |
4064 | } | 4064 | } |
@@ -4409,7 +4409,7 @@ static int pmu_write_cmd(struct pmu_gk20a *pmu, struct pmu_cmd *cmd, | |||
4409 | 4409 | ||
4410 | do { | 4410 | do { |
4411 | err = pmu_queue_open_write(pmu, queue, cmd->hdr.size); | 4411 | err = pmu_queue_open_write(pmu, queue, cmd->hdr.size); |
4412 | if (err == -EAGAIN && !nvgpu_timeout_check(&timeout)) | 4412 | if (err == -EAGAIN && !nvgpu_timeout_expired(&timeout)) |
4413 | usleep_range(1000, 2000); | 4413 | usleep_range(1000, 2000); |
4414 | else | 4414 | else |
4415 | break; | 4415 | break; |