diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-06 16:10:30 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-10 15:24:27 -0400 |
commit | 5405070ecd27ce462babc1dff231fec5cd8bd6b7 (patch) | |
tree | 903461959633aec359b5bb3f4f660c5dcb6bdbcf /drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | |
parent | 3a1104c3699b05201abf48ed9283bb8ccbe42732 (diff) |
gpu: nvgpu: vgpu: Use new error macros
gk20a_err() and gk20a_warn() require a struct device pointer,
which is not portable across operating systems. The new nvgpu_err()
and nvgpu_warn() macros take struct gk20a pointer. Convert code
to use the more portable macros.
JIRA NVGPU-16
Change-Id: I071e8c50959bfa81730ca964d912bc69f9c7e6ad
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1457355
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c index 1a5811fe..cc9c46bf 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | |||
@@ -88,7 +88,7 @@ static int vgpu_gr_gp10b_alloc_gr_ctx(struct gk20a *g, | |||
88 | err = g->ops.gr.set_ctxsw_preemption_mode(g, gr_ctx, vm, | 88 | err = g->ops.gr.set_ctxsw_preemption_mode(g, gr_ctx, vm, |
89 | class, graphics_preempt_mode, compute_preempt_mode); | 89 | class, graphics_preempt_mode, compute_preempt_mode); |
90 | if (err) { | 90 | if (err) { |
91 | gk20a_err(dev_from_gk20a(g), | 91 | nvgpu_err(g, |
92 | "set_ctxsw_preemption_mode failed"); | 92 | "set_ctxsw_preemption_mode failed"); |
93 | goto fail; | 93 | goto fail; |
94 | } | 94 | } |
@@ -254,7 +254,7 @@ static int vgpu_gr_gp10b_set_ctxsw_preemption_mode(struct gk20a *g, | |||
254 | return err; | 254 | return err; |
255 | 255 | ||
256 | fail: | 256 | fail: |
257 | gk20a_err(dev_from_gk20a(g), "%s failed %d", __func__, err); | 257 | nvgpu_err(g, "%s failed %d", __func__, err); |
258 | return err; | 258 | return err; |
259 | } | 259 | } |
260 | 260 | ||
@@ -297,8 +297,7 @@ static int vgpu_gr_gp10b_set_preemption_mode(struct channel_gk20a *ch, | |||
297 | graphics_preempt_mode, | 297 | graphics_preempt_mode, |
298 | compute_preempt_mode); | 298 | compute_preempt_mode); |
299 | if (err) { | 299 | if (err) { |
300 | gk20a_err(dev_from_gk20a(g), | 300 | nvgpu_err(g, "set_ctxsw_preemption_mode failed"); |
301 | "set_ctxsw_preemption_mode failed"); | ||
302 | return err; | 301 | return err; |
303 | } | 302 | } |
304 | } else { | 303 | } else { |