diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/ioctl_tsg.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c index c98d9873..55a909dd 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/anon_inodes.h> | 23 | #include <linux/anon_inodes.h> |
24 | 24 | ||
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/log.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/tsg_gk20a.h" | 29 | #include "gk20a/tsg_gk20a.h" |
@@ -188,8 +189,7 @@ static int gk20a_tsg_event_id_ctrl(struct gk20a *g, struct tsg_gk20a *tsg, | |||
188 | break; | 189 | break; |
189 | 190 | ||
190 | default: | 191 | default: |
191 | gk20a_err(dev_from_gk20a(tsg->g), | 192 | nvgpu_err(tsg->g, "unrecognized tsg event id cmd: 0x%x", |
192 | "unrecognized tsg event id cmd: 0x%x", | ||
193 | args->cmd); | 193 | args->cmd); |
194 | err = -EINVAL; | 194 | err = -EINVAL; |
195 | break; | 195 | break; |
@@ -274,7 +274,7 @@ static int gk20a_tsg_ioctl_set_priority(struct gk20a *g, | |||
274 | 274 | ||
275 | err = gk20a_busy(g); | 275 | err = gk20a_busy(g); |
276 | if (err) { | 276 | if (err) { |
277 | gk20a_err(dev_from_gk20a(g), "failed to power on gpu"); | 277 | nvgpu_err(g, "failed to power on gpu"); |
278 | goto done; | 278 | goto done; |
279 | } | 279 | } |
280 | 280 | ||
@@ -301,7 +301,7 @@ static int gk20a_tsg_ioctl_set_runlist_interleave(struct gk20a *g, | |||
301 | } | 301 | } |
302 | err = gk20a_busy(g); | 302 | err = gk20a_busy(g); |
303 | if (err) { | 303 | if (err) { |
304 | gk20a_err(dev_from_gk20a(g), "failed to power on gpu"); | 304 | nvgpu_err(g, "failed to power on gpu"); |
305 | goto done; | 305 | goto done; |
306 | } | 306 | } |
307 | 307 | ||
@@ -328,7 +328,7 @@ static int gk20a_tsg_ioctl_set_timeslice(struct gk20a *g, | |||
328 | } | 328 | } |
329 | err = gk20a_busy(g); | 329 | err = gk20a_busy(g); |
330 | if (err) { | 330 | if (err) { |
331 | gk20a_err(dev_from_gk20a(g), "failed to power on gpu"); | 331 | nvgpu_err(g, "failed to power on gpu"); |
332 | goto done; | 332 | goto done; |
333 | } | 333 | } |
334 | err = gk20a_tsg_set_timeslice(tsg, arg->timeslice_us); | 334 | err = gk20a_tsg_set_timeslice(tsg, arg->timeslice_us); |
@@ -392,7 +392,7 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd, | |||
392 | { | 392 | { |
393 | err = gk20a_busy(g); | 393 | err = gk20a_busy(g); |
394 | if (err) { | 394 | if (err) { |
395 | gk20a_err(g->dev, | 395 | nvgpu_err(g, |
396 | "failed to host gk20a for ioctl cmd: 0x%x", cmd); | 396 | "failed to host gk20a for ioctl cmd: 0x%x", cmd); |
397 | return err; | 397 | return err; |
398 | } | 398 | } |
@@ -405,7 +405,7 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd, | |||
405 | { | 405 | { |
406 | err = gk20a_busy(g); | 406 | err = gk20a_busy(g); |
407 | if (err) { | 407 | if (err) { |
408 | gk20a_err(g->dev, | 408 | nvgpu_err(g, |
409 | "failed to host gk20a for ioctl cmd: 0x%x", cmd); | 409 | "failed to host gk20a for ioctl cmd: 0x%x", cmd); |
410 | return err; | 410 | return err; |
411 | } | 411 | } |
@@ -418,7 +418,7 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd, | |||
418 | { | 418 | { |
419 | err = gk20a_busy(g); | 419 | err = gk20a_busy(g); |
420 | if (err) { | 420 | if (err) { |
421 | gk20a_err(g->dev, | 421 | nvgpu_err(g, |
422 | "failed to host gk20a for ioctl cmd: 0x%x", cmd); | 422 | "failed to host gk20a for ioctl cmd: 0x%x", cmd); |
423 | return err; | 423 | return err; |
424 | } | 424 | } |
@@ -455,8 +455,7 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd, | |||
455 | } | 455 | } |
456 | 456 | ||
457 | default: | 457 | default: |
458 | gk20a_err(dev_from_gk20a(g), | 458 | nvgpu_err(g, "unrecognized tsg gpu ioctl cmd: 0x%x", |
459 | "unrecognized tsg gpu ioctl cmd: 0x%x", | ||
460 | cmd); | 459 | cmd); |
461 | err = -ENOTTY; | 460 | err = -ENOTTY; |
462 | break; | 461 | break; |