diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 6aae851e..c2daf27e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -71,12 +71,11 @@ void __gk20a_warn_on_no_regs(void) | |||
71 | static int gk20a_detect_chip(struct gk20a *g) | 71 | static int gk20a_detect_chip(struct gk20a *g) |
72 | { | 72 | { |
73 | struct nvgpu_gpu_params *p = &g->params; | 73 | struct nvgpu_gpu_params *p = &g->params; |
74 | u32 val; | ||
75 | 74 | ||
76 | if (p->gpu_arch) | 75 | if (p->gpu_arch) |
77 | return 0; | 76 | return 0; |
78 | 77 | ||
79 | val = gk20a_mc_boot_0(g, &p->gpu_arch, &p->gpu_impl, &p->gpu_rev); | 78 | gk20a_mc_boot_0(g, &p->gpu_arch, &p->gpu_impl, &p->gpu_rev); |
80 | 79 | ||
81 | gk20a_dbg_info("arch: %x, impl: %x, rev: %x\n", | 80 | gk20a_dbg_info("arch: %x, impl: %x, rev: %x\n", |
82 | g->params.gpu_arch, | 81 | g->params.gpu_arch, |
@@ -375,8 +374,8 @@ int gk20a_wait_for_idle(struct gk20a *g) | |||
375 | nvgpu_msleep(20); | 374 | nvgpu_msleep(20); |
376 | 375 | ||
377 | if (wait_length < 0) { | 376 | if (wait_length < 0) { |
378 | pr_warn("%s: Timed out waiting for idle (%d)!\n", | 377 | nvgpu_warn(g, "Timed out waiting for idle (%d)!\n", |
379 | __func__, nvgpu_atomic_read(&g->usage_count)); | 378 | nvgpu_atomic_read(&g->usage_count)); |
380 | return -ETIMEDOUT; | 379 | return -ETIMEDOUT; |
381 | } | 380 | } |
382 | 381 | ||