summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2018-01-29 19:15:58 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-02-27 17:30:20 -0500
commit0e39ad429e8aa68cd11e464cd76a8b9d1912fb7d (patch)
treef0e0e5b082d59333aea7276375b1b1c15f05b0c4 /drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
parent26f22226bad5b31ec57938bad17cc1e1c1d60343 (diff)
gpu: nvgpu: vgpu: move to nvgpu_err/info from dev_err/info
It helps code be more portable. Jira EVLR-2364 Change-Id: I0cc1fa739d7884d3c863975f08b3b592acd34613 Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1649941 Reviewed-by: Aingara Paramakuru <aparamakuru@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Nirav Patel <nipatel@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c')
-rw-r--r--drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
index 3e493506..f7e24382 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c
@@ -54,7 +54,7 @@ int vgpu_fecs_trace_init(struct gk20a *g)
54 err = of_parse_phandle_with_fixed_args(np, 54 err = of_parse_phandle_with_fixed_args(np,
55 "mempool-fecs-trace", 1, 0, &args); 55 "mempool-fecs-trace", 1, 0, &args);
56 if (err) { 56 if (err) {
57 dev_info(dev_from_gk20a(g), "does not support fecs trace\n"); 57 nvgpu_info(g, "does not support fecs trace");
58 goto fail; 58 goto fail;
59 } 59 }
60 __nvgpu_set_enabled(g, NVGPU_SUPPORT_FECS_CTXSW_TRACE, true); 60 __nvgpu_set_enabled(g, NVGPU_SUPPORT_FECS_CTXSW_TRACE, true);
@@ -62,8 +62,8 @@ int vgpu_fecs_trace_init(struct gk20a *g)
62 mempool = args.args[0]; 62 mempool = args.args[0];
63 vcst->cookie = vgpu_ivm_mempool_reserve(mempool); 63 vcst->cookie = vgpu_ivm_mempool_reserve(mempool);
64 if (IS_ERR(vcst->cookie)) { 64 if (IS_ERR(vcst->cookie)) {
65 dev_info(dev_from_gk20a(g), 65 nvgpu_info(g,
66 "mempool %u reserve failed\n", mempool); 66 "mempool %u reserve failed", mempool);
67 vcst->cookie = NULL; 67 vcst->cookie = NULL;
68 err = -EINVAL; 68 err = -EINVAL;
69 goto fail; 69 goto fail;
@@ -72,15 +72,14 @@ int vgpu_fecs_trace_init(struct gk20a *g)
72 vcst->buf = ioremap_cache(vgpu_ivm_get_ipa(vcst->cookie), 72 vcst->buf = ioremap_cache(vgpu_ivm_get_ipa(vcst->cookie),
73 vgpu_ivm_get_size(vcst->cookie)); 73 vgpu_ivm_get_size(vcst->cookie));
74 if (!vcst->buf) { 74 if (!vcst->buf) {
75 dev_info(dev_from_gk20a(g), "ioremap_cache failed\n"); 75 nvgpu_info(g, "ioremap_cache failed");
76 err = -EINVAL; 76 err = -EINVAL;
77 goto fail; 77 goto fail;
78 } 78 }
79 vcst->header = vcst->buf; 79 vcst->header = vcst->buf;
80 vcst->num_entries = vcst->header->num_ents; 80 vcst->num_entries = vcst->header->num_ents;
81 if (unlikely(vcst->header->ent_size != sizeof(*vcst->entries))) { 81 if (unlikely(vcst->header->ent_size != sizeof(*vcst->entries))) {
82 dev_err(dev_from_gk20a(g), 82 nvgpu_err(g, "entry size mismatch");
83 "entry size mismatch\n");
84 goto fail; 83 goto fail;
85 } 84 }
86 vcst->entries = vcst->buf + sizeof(*vcst->header); 85 vcst->entries = vcst->buf + sizeof(*vcst->header);