diff options
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 8b5a1a9e..e487e079 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -2218,7 +2218,6 @@ static void gk20a_channel_clean_up_jobs(struct channel_gk20a *c, | |||
2218 | platform = gk20a_get_platform(g->dev); | 2218 | platform = gk20a_get_platform(g->dev); |
2219 | 2219 | ||
2220 | gk20a_channel_cancel_job_clean_up(c, false); | 2220 | gk20a_channel_cancel_job_clean_up(c, false); |
2221 | gk20a_channel_timeout_stop(c); | ||
2222 | 2221 | ||
2223 | while (1) { | 2222 | while (1) { |
2224 | bool completed; | 2223 | bool completed; |
@@ -2244,8 +2243,6 @@ static void gk20a_channel_clean_up_jobs(struct channel_gk20a *c, | |||
2244 | break; | 2243 | break; |
2245 | } | 2244 | } |
2246 | 2245 | ||
2247 | gk20a_channel_timeout_stop(c); | ||
2248 | |||
2249 | WARN_ON(!c->sync); | 2246 | WARN_ON(!c->sync); |
2250 | 2247 | ||
2251 | if (c->sync) { | 2248 | if (c->sync) { |
@@ -2317,6 +2314,7 @@ void gk20a_channel_update(struct channel_gk20a *c, int nr_completed) | |||
2317 | } | 2314 | } |
2318 | 2315 | ||
2319 | trace_gk20a_channel_update(c->hw_chid); | 2316 | trace_gk20a_channel_update(c->hw_chid); |
2317 | gk20a_channel_timeout_stop(c); | ||
2320 | gk20a_channel_schedule_job_clean_up(c); | 2318 | gk20a_channel_schedule_job_clean_up(c); |
2321 | 2319 | ||
2322 | gk20a_channel_put(c); | 2320 | gk20a_channel_put(c); |