diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |