diff options
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_as.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvhost.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/timers.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/css_vgpu.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 7 |
7 files changed, 18 insertions, 22 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index a7bc230c..eb4f490f 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -165,9 +165,9 @@ int nvgpu_probe(struct gk20a *g, | |||
165 | err = platform->probe(g->dev); | 165 | err = platform->probe(g->dev); |
166 | if (err) { | 166 | if (err) { |
167 | if (err == -EPROBE_DEFER) | 167 | if (err == -EPROBE_DEFER) |
168 | dev_info(g->dev, "platform probe failed"); | 168 | nvgpu_info(g, "platform probe failed"); |
169 | else | 169 | else |
170 | dev_err(g->dev, "platform probe failed"); | 170 | nvgpu_err(g, "platform probe failed"); |
171 | return err; | 171 | return err; |
172 | } | 172 | } |
173 | 173 | ||
@@ -184,7 +184,7 @@ int nvgpu_probe(struct gk20a *g, | |||
184 | if (platform->late_probe) { | 184 | if (platform->late_probe) { |
185 | err = platform->late_probe(g->dev); | 185 | err = platform->late_probe(g->dev); |
186 | if (err) { | 186 | if (err) { |
187 | dev_err(g->dev, "late probe failed"); | 187 | nvgpu_err(g, "late probe failed"); |
188 | return err; | 188 | return err; |
189 | } | 189 | } |
190 | } | 190 | } |
@@ -196,7 +196,7 @@ int nvgpu_probe(struct gk20a *g, | |||
196 | 196 | ||
197 | g->dbg_regops_tmp_buf = nvgpu_kzalloc(g, SZ_4K); | 197 | g->dbg_regops_tmp_buf = nvgpu_kzalloc(g, SZ_4K); |
198 | if (!g->dbg_regops_tmp_buf) { | 198 | if (!g->dbg_regops_tmp_buf) { |
199 | dev_err(g->dev, "couldn't allocate regops tmp buf"); | 199 | nvgpu_err(g, "couldn't allocate regops tmp buf"); |
200 | return -ENOMEM; | 200 | return -ENOMEM; |
201 | } | 201 | } |
202 | g->dbg_regops_tmp_buf_ops = | 202 | g->dbg_regops_tmp_buf_ops = |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c index 405301ee..273024bd 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c | |||
@@ -377,7 +377,6 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
377 | (struct nvgpu_as_map_buffer_batch_args *)buf); | 377 | (struct nvgpu_as_map_buffer_batch_args *)buf); |
378 | break; | 378 | break; |
379 | default: | 379 | default: |
380 | dev_dbg(dev_from_gk20a(g), "unrecognized as ioctl: 0x%x", cmd); | ||
381 | err = -ENOTTY; | 380 | err = -ENOTTY; |
382 | break; | 381 | break; |
383 | } | 382 | } |
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/common/linux/nvhost.c index e190096e..96865f7d 100644 --- a/drivers/gpu/nvgpu/common/linux/nvhost.c +++ b/drivers/gpu/nvgpu/common/linux/nvhost.c | |||
@@ -37,13 +37,13 @@ int nvgpu_get_nvhost_dev(struct gk20a *g) | |||
37 | 37 | ||
38 | host1x_pdev = of_find_device_by_node(host1x_node); | 38 | host1x_pdev = of_find_device_by_node(host1x_node); |
39 | if (!host1x_pdev) { | 39 | if (!host1x_pdev) { |
40 | dev_warn(g->dev, "host1x device not available"); | 40 | nvgpu_warn(g, "host1x device not available"); |
41 | return -EPROBE_DEFER; | 41 | return -EPROBE_DEFER; |
42 | } | 42 | } |
43 | 43 | ||
44 | } else { | 44 | } else { |
45 | if (g->has_syncpoints) { | 45 | if (g->has_syncpoints) { |
46 | dev_warn(g->dev, "host1x reference not found. assuming no syncpoints support\n"); | 46 | nvgpu_warn(g, "host1x reference not found. assuming no syncpoints support"); |
47 | g->has_syncpoints = false; | 47 | g->has_syncpoints = false; |
48 | } | 48 | } |
49 | return 0; | 49 | return 0; |
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/common/linux/timers.c index cfebb799..2953902e 100644 --- a/drivers/gpu/nvgpu/common/linux/timers.c +++ b/drivers/gpu/nvgpu/common/linux/timers.c | |||
@@ -97,8 +97,7 @@ static int __nvgpu_timeout_expired_msg_cpu(struct nvgpu_timeout *timeout, | |||
97 | 97 | ||
98 | vsnprintf(buf, sizeof(buf), fmt, args); | 98 | vsnprintf(buf, sizeof(buf), fmt, args); |
99 | 99 | ||
100 | dev_err(dev_from_gk20a(g), | 100 | nvgpu_err(g, "Timeout detected @ %pF %s", caller, buf); |
101 | "Timeout detected @ %pF %s\n", caller, buf); | ||
102 | } | 101 | } |
103 | 102 | ||
104 | return -ETIMEDOUT; | 103 | return -ETIMEDOUT; |
@@ -122,8 +121,7 @@ static int __nvgpu_timeout_expired_msg_retry(struct nvgpu_timeout *timeout, | |||
122 | 121 | ||
123 | vsnprintf(buf, sizeof(buf), fmt, args); | 122 | vsnprintf(buf, sizeof(buf), fmt, args); |
124 | 123 | ||
125 | dev_err(dev_from_gk20a(g), | 124 | nvgpu_err(g, "No more retries @ %pF %s", caller, buf); |
126 | "No more retries @ %pF %s\n", caller, buf); | ||
127 | } | 125 | } |
128 | 126 | ||
129 | return -ETIMEDOUT; | 127 | return -ETIMEDOUT; |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 52053c14..9cc4f58e 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -2050,7 +2050,7 @@ int nvgpu_vm_map_buffer(struct vm_gk20a *vm, | |||
2050 | /* get ref to the mem handle (released on unmap_locked) */ | 2050 | /* get ref to the mem handle (released on unmap_locked) */ |
2051 | dmabuf = dma_buf_get(dmabuf_fd); | 2051 | dmabuf = dma_buf_get(dmabuf_fd); |
2052 | if (IS_ERR(dmabuf)) { | 2052 | if (IS_ERR(dmabuf)) { |
2053 | dev_warn(dev_from_vm(vm), "%s: fd %d is not a dmabuf", | 2053 | nvgpu_warn(gk20a_from_vm(vm), "%s: fd %d is not a dmabuf", |
2054 | __func__, dmabuf_fd); | 2054 | __func__, dmabuf_fd); |
2055 | return PTR_ERR(dmabuf); | 2055 | return PTR_ERR(dmabuf); |
2056 | } | 2056 | } |
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 = |