diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index cdf36454..30bb6efe 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |||
@@ -330,13 +330,13 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c) | |||
330 | sp->host1x_pdev = c->g->host1x_dev; | 330 | sp->host1x_pdev = c->g->host1x_dev; |
331 | 331 | ||
332 | snprintf(syncpt_name, sizeof(syncpt_name), | 332 | snprintf(syncpt_name, sizeof(syncpt_name), |
333 | "%s_%d", dev_name(&c->g->dev->dev), c->hw_chid); | 333 | "%s_%d", dev_name(c->g->dev), c->hw_chid); |
334 | 334 | ||
335 | sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, | 335 | sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, |
336 | c->hw_chid, syncpt_name); | 336 | c->hw_chid, syncpt_name); |
337 | if (!sp->id) { | 337 | if (!sp->id) { |
338 | kfree(sp); | 338 | kfree(sp); |
339 | gk20a_err(&c->g->dev->dev, "failed to get free syncpt"); | 339 | gk20a_err(c->g->dev, "failed to get free syncpt"); |
340 | return NULL; | 340 | return NULL; |
341 | } | 341 | } |
342 | 342 | ||
@@ -387,7 +387,7 @@ static void gk20a_channel_semaphore_launcher( | |||
387 | fence, fence->name); | 387 | fence, fence->name); |
388 | err = sync_fence_wait(fence, -1); | 388 | err = sync_fence_wait(fence, -1); |
389 | if (err < 0) | 389 | if (err < 0) |
390 | dev_err(&g->dev->dev, "error waiting pre-fence: %d\n", err); | 390 | dev_err(g->dev, "error waiting pre-fence: %d\n", err); |
391 | 391 | ||
392 | gk20a_dbg_info( | 392 | gk20a_dbg_info( |
393 | "wait completed (%d) for fence %p '%s', triggering gpu work", | 393 | "wait completed (%d) for fence %p '%s', triggering gpu work", |