diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-06-22 16:15:17 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-30 21:34:59 -0400 |
commit | 6f0fcbc667ca55ed25818467069853e6d750cd7d (patch) | |
tree | 26cb9d675fd262b04485df6b8d21bb82a491a2c1 /drivers/gpu/nvgpu/vgpu | |
parent | 001c7c3185d9b087f89f48a41bee27d2d06721f6 (diff) |
gpu: nvgpu: Convert logging from dev_*() to nvgpu_*()
Convert a few calls from dev_*() logging to nvgpu_*(). This reduces
dependency to Linux specific struct device pointer.
JIRA NVGPU-38
Change-Id: Ib51a6b1287db25b7dd4d164aec3ac75fa2801ebf
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master/r/1507929
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/css_vgpu.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 7 |
2 files changed, 9 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c index cca8766b..d18ed100 100644 --- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -46,7 +46,7 @@ static int vgpu_css_init_snapshot_buffer(struct gr_gk20a *gr) | |||
46 | err = of_parse_phandle_with_fixed_args(np, | 46 | err = of_parse_phandle_with_fixed_args(np, |
47 | "mempool-css", 1, 0, &args); | 47 | "mempool-css", 1, 0, &args); |
48 | if (err) { | 48 | if (err) { |
49 | dev_info(dev_from_gk20a(g), "dt missing mempool-css\n"); | 49 | nvgpu_info(g, "dt missing mempool-css"); |
50 | goto fail; | 50 | goto fail; |
51 | } | 51 | } |
52 | 52 | ||
@@ -54,15 +54,15 @@ static int vgpu_css_init_snapshot_buffer(struct gr_gk20a *gr) | |||
54 | mempool = args.args[0]; | 54 | mempool = args.args[0]; |
55 | css_cookie = tegra_hv_mempool_reserve(hv_np, mempool); | 55 | css_cookie = tegra_hv_mempool_reserve(hv_np, mempool); |
56 | if (IS_ERR(css_cookie)) { | 56 | if (IS_ERR(css_cookie)) { |
57 | dev_info(dev_from_gk20a(g), | 57 | nvgpu_info(g, |
58 | "mempool %u reserve failed\n", mempool); | 58 | "mempool %u reserve failed", mempool); |
59 | err = -EINVAL; | 59 | err = -EINVAL; |
60 | goto fail; | 60 | goto fail; |
61 | } | 61 | } |
62 | 62 | ||
63 | /* Make sure buffer size is large enough */ | 63 | /* Make sure buffer size is large enough */ |
64 | if (css_cookie->size < CSS_MIN_HW_SNAPSHOT_SIZE) { | 64 | if (css_cookie->size < CSS_MIN_HW_SNAPSHOT_SIZE) { |
65 | dev_info(dev_from_gk20a(g), "mempool size %lld too small\n", | 65 | nvgpu_info(g, "mempool size %lld too small", |
66 | css_cookie->size); | 66 | css_cookie->size); |
67 | err = -ENOMEM; | 67 | err = -ENOMEM; |
68 | goto fail; | 68 | goto fail; |
@@ -74,7 +74,7 @@ static int vgpu_css_init_snapshot_buffer(struct gr_gk20a *gr) | |||
74 | buf = ioremap_cache(css_cookie->ipa, css_cookie->size); | 74 | buf = ioremap_cache(css_cookie->ipa, css_cookie->size); |
75 | #endif | 75 | #endif |
76 | if (!buf) { | 76 | if (!buf) { |
77 | dev_info(dev_from_gk20a(g), "ioremap_cache failed\n"); | 77 | nvgpu_info(g, "ioremap_cache failed"); |
78 | err = -EINVAL; | 78 | err = -EINVAL; |
79 | goto fail; | 79 | goto fail; |
80 | } | 80 | } |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index d41c0abb..da77dc19 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -268,7 +268,7 @@ static int vgpu_init_support(struct platform_device *pdev) | |||
268 | int err = 0; | 268 | int err = 0; |
269 | 269 | ||
270 | if (!r) { | 270 | if (!r) { |
271 | dev_err(dev_from_gk20a(g), "faield to get gk20a bar1\n"); | 271 | nvgpu_err(g, "failed to get gk20a bar1"); |
272 | err = -ENXIO; | 272 | err = -ENXIO; |
273 | goto fail; | 273 | goto fail; |
274 | } | 274 | } |
@@ -276,8 +276,7 @@ static int vgpu_init_support(struct platform_device *pdev) | |||
276 | if (r->name && !strcmp(r->name, "/vgpu")) { | 276 | if (r->name && !strcmp(r->name, "/vgpu")) { |
277 | regs = devm_ioremap_resource(&pdev->dev, r); | 277 | regs = devm_ioremap_resource(&pdev->dev, r); |
278 | if (IS_ERR(regs)) { | 278 | if (IS_ERR(regs)) { |
279 | dev_err(dev_from_gk20a(g), | 279 | nvgpu_err(g, "failed to remap gk20a bar1"); |
280 | "failed to remap gk20a regs\n"); | ||
281 | err = PTR_ERR(regs); | 280 | err = PTR_ERR(regs); |
282 | goto fail; | 281 | goto fail; |
283 | } | 282 | } |
@@ -292,7 +291,7 @@ static int vgpu_init_support(struct platform_device *pdev) | |||
292 | 291 | ||
293 | g->dbg_regops_tmp_buf = nvgpu_kzalloc(g, SZ_4K); | 292 | g->dbg_regops_tmp_buf = nvgpu_kzalloc(g, SZ_4K); |
294 | if (!g->dbg_regops_tmp_buf) { | 293 | if (!g->dbg_regops_tmp_buf) { |
295 | dev_err(g->dev, "couldn't allocate regops tmp buf"); | 294 | nvgpu_err(g, "couldn't allocate regops tmp buf"); |
296 | return -ENOMEM; | 295 | return -ENOMEM; |
297 | } | 296 | } |
298 | g->dbg_regops_tmp_buf_ops = | 297 | g->dbg_regops_tmp_buf_ops = |