diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index 7a707fbd..be9f1c70 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |||
@@ -155,22 +155,11 @@ static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd, | |||
155 | static void gk20a_channel_syncpt_update(void *priv, int nr_completed) | 155 | static void gk20a_channel_syncpt_update(void *priv, int nr_completed) |
156 | { | 156 | { |
157 | struct channel_gk20a *ch = priv; | 157 | struct channel_gk20a *ch = priv; |
158 | struct gk20a *g = ch->g; | ||
159 | |||
160 | /* need busy for possible channel deletion */ | ||
161 | if (gk20a_busy(ch->g->dev)) { | ||
162 | gk20a_err(dev_from_gk20a(ch->g), | ||
163 | "failed to busy while syncpt update"); | ||
164 | /* Last gk20a_idle()s are in channel_update, so we shouldn't | ||
165 | * get here. If we do, the channel is badly broken now */ | ||
166 | return; | ||
167 | } | ||
168 | 158 | ||
169 | /* note: channel_get() is in __gk20a_channel_syncpt_incr() */ | ||
170 | gk20a_channel_update(ch, nr_completed); | 159 | gk20a_channel_update(ch, nr_completed); |
171 | gk20a_channel_put(ch); | ||
172 | 160 | ||
173 | gk20a_idle(g->dev); | 161 | /* note: channel_get() is in __gk20a_channel_syncpt_incr() */ |
162 | gk20a_channel_put(ch); | ||
174 | } | 163 | } |
175 | 164 | ||
176 | static int __gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, | 165 | static int __gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, |