diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index e8008937..e862f2e4 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -77,7 +77,7 @@ int gk20a_detect_chip(struct gk20a *g) | |||
77 | 77 | ||
78 | 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); |
79 | 79 | ||
80 | gk20a_dbg_info("arch: %x, impl: %x, rev: %x\n", | 80 | nvgpu_log_info(g, "arch: %x, impl: %x, rev: %x\n", |
81 | g->params.gpu_arch, | 81 | g->params.gpu_arch, |
82 | g->params.gpu_impl, | 82 | g->params.gpu_impl, |
83 | g->params.gpu_rev); | 83 | g->params.gpu_rev); |
@@ -89,7 +89,7 @@ int gk20a_prepare_poweroff(struct gk20a *g) | |||
89 | { | 89 | { |
90 | int ret = 0; | 90 | int ret = 0; |
91 | 91 | ||
92 | gk20a_dbg_fn(""); | 92 | nvgpu_log_fn(g, " "); |
93 | 93 | ||
94 | if (g->ops.fifo.channel_suspend) { | 94 | if (g->ops.fifo.channel_suspend) { |
95 | ret = g->ops.fifo.channel_suspend(g); | 95 | ret = g->ops.fifo.channel_suspend(g); |
@@ -126,7 +126,7 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
126 | u32 nr_pages; | 126 | u32 nr_pages; |
127 | #endif | 127 | #endif |
128 | 128 | ||
129 | gk20a_dbg_fn(""); | 129 | nvgpu_log_fn(g, " "); |
130 | 130 | ||
131 | if (g->power_on) | 131 | if (g->power_on) |
132 | return 0; | 132 | return 0; |
@@ -434,7 +434,7 @@ static void gk20a_free_cb(struct nvgpu_ref *refcount) | |||
434 | struct gk20a *g = container_of(refcount, | 434 | struct gk20a *g = container_of(refcount, |
435 | struct gk20a, refcount); | 435 | struct gk20a, refcount); |
436 | 436 | ||
437 | gk20a_dbg(gpu_dbg_shutdown, "Freeing GK20A struct!"); | 437 | nvgpu_log(g, gpu_dbg_shutdown, "Freeing GK20A struct!"); |
438 | 438 | ||
439 | gk20a_ce_destroy(g); | 439 | gk20a_ce_destroy(g); |
440 | 440 | ||
@@ -465,7 +465,7 @@ struct gk20a * __must_check gk20a_get(struct gk20a *g) | |||
465 | */ | 465 | */ |
466 | success = nvgpu_ref_get_unless_zero(&g->refcount); | 466 | success = nvgpu_ref_get_unless_zero(&g->refcount); |
467 | 467 | ||
468 | gk20a_dbg(gpu_dbg_shutdown, "GET: refs currently %d %s", | 468 | nvgpu_log(g, gpu_dbg_shutdown, "GET: refs currently %d %s", |
469 | nvgpu_atomic_read(&g->refcount.refcount), | 469 | nvgpu_atomic_read(&g->refcount.refcount), |
470 | success ? "" : "(FAILED)"); | 470 | success ? "" : "(FAILED)"); |
471 | 471 | ||
@@ -490,7 +490,7 @@ void gk20a_put(struct gk20a *g) | |||
490 | * ... PUT: refs currently 2 | 490 | * ... PUT: refs currently 2 |
491 | * ... Freeing GK20A struct! | 491 | * ... Freeing GK20A struct! |
492 | */ | 492 | */ |
493 | gk20a_dbg(gpu_dbg_shutdown, "PUT: refs currently %d", | 493 | nvgpu_log(g, gpu_dbg_shutdown, "PUT: refs currently %d", |
494 | nvgpu_atomic_read(&g->refcount.refcount)); | 494 | nvgpu_atomic_read(&g->refcount.refcount)); |
495 | 495 | ||
496 | nvgpu_ref_put(&g->refcount, gk20a_free_cb); | 496 | nvgpu_ref_put(&g->refcount, gk20a_free_cb); |