diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c b/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c index e4ac68a3..9593e2b7 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c | |||
@@ -53,7 +53,7 @@ static int nvgpu_clk_arb_release_completion_dev(struct inode *inode, | |||
53 | struct nvgpu_clk_session *session = dev->session; | 53 | struct nvgpu_clk_session *session = dev->session; |
54 | 54 | ||
55 | 55 | ||
56 | nvgpu_log(session->g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 56 | clk_arb_dbg(session->g, " "); |
57 | 57 | ||
58 | nvgpu_ref_put(&session->refcount, nvgpu_clk_arb_free_session); | 58 | nvgpu_ref_put(&session->refcount, nvgpu_clk_arb_free_session); |
59 | nvgpu_ref_put(&dev->refcount, nvgpu_clk_arb_free_fd); | 59 | nvgpu_ref_put(&dev->refcount, nvgpu_clk_arb_free_fd); |
@@ -82,7 +82,7 @@ static unsigned int nvgpu_clk_arb_poll_dev(struct file *filp, poll_table *wait) | |||
82 | { | 82 | { |
83 | struct nvgpu_clk_dev *dev = filp->private_data; | 83 | struct nvgpu_clk_dev *dev = filp->private_data; |
84 | 84 | ||
85 | nvgpu_log(dev->session->g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 85 | clk_arb_dbg(dev->session->g, " "); |
86 | 86 | ||
87 | poll_wait(filp, &dev->readout_wq.wq, wait); | 87 | poll_wait(filp, &dev->readout_wq.wq, wait); |
88 | return nvgpu_convert_poll_mask(nvgpu_atomic_xchg(&dev->poll_mask, 0)); | 88 | return nvgpu_convert_poll_mask(nvgpu_atomic_xchg(&dev->poll_mask, 0)); |
@@ -97,7 +97,7 @@ static int nvgpu_clk_arb_release_event_dev(struct inode *inode, | |||
97 | 97 | ||
98 | arb = session->g->clk_arb; | 98 | arb = session->g->clk_arb; |
99 | 99 | ||
100 | nvgpu_log(session->g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 100 | clk_arb_dbg(session->g, " "); |
101 | 101 | ||
102 | if (arb) { | 102 | if (arb) { |
103 | nvgpu_spinlock_acquire(&arb->users_lock); | 103 | nvgpu_spinlock_acquire(&arb->users_lock); |
@@ -180,7 +180,7 @@ static ssize_t nvgpu_clk_arb_read_event_dev(struct file *filp, char __user *buf, | |||
180 | struct nvgpu_gpu_event_info info; | 180 | struct nvgpu_gpu_event_info info; |
181 | ssize_t err; | 181 | ssize_t err; |
182 | 182 | ||
183 | nvgpu_log(dev->session->g, gpu_dbg_fn | gpu_dbg_clk_arb, | 183 | clk_arb_dbg(dev->session->g, |
184 | "filp=%p, buf=%p, size=%zu", filp, buf, size); | 184 | "filp=%p, buf=%p, size=%zu", filp, buf, size); |
185 | 185 | ||
186 | if ((size - *off) < sizeof(info)) | 186 | if ((size - *off) < sizeof(info)) |
@@ -296,7 +296,7 @@ static int nvgpu_clk_arb_install_fd(struct gk20a *g, | |||
296 | char name[64]; | 296 | char name[64]; |
297 | struct nvgpu_clk_dev *dev; | 297 | struct nvgpu_clk_dev *dev; |
298 | 298 | ||
299 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 299 | clk_arb_dbg(g, " "); |
300 | 300 | ||
301 | dev = nvgpu_kzalloc(g, sizeof(*dev)); | 301 | dev = nvgpu_kzalloc(g, sizeof(*dev)); |
302 | if (!dev) | 302 | if (!dev) |
@@ -352,7 +352,7 @@ int nvgpu_clk_arb_install_event_fd(struct gk20a *g, | |||
352 | struct nvgpu_clk_dev *dev; | 352 | struct nvgpu_clk_dev *dev; |
353 | int fd; | 353 | int fd; |
354 | 354 | ||
355 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 355 | clk_arb_dbg(g, " "); |
356 | 356 | ||
357 | fd = nvgpu_clk_arb_install_fd(g, session, &event_dev_ops, &dev); | 357 | fd = nvgpu_clk_arb_install_fd(g, session, &event_dev_ops, &dev); |
358 | if (fd < 0) | 358 | if (fd < 0) |
@@ -384,7 +384,7 @@ int nvgpu_clk_arb_install_request_fd(struct gk20a *g, | |||
384 | struct nvgpu_clk_dev *dev; | 384 | struct nvgpu_clk_dev *dev; |
385 | int fd; | 385 | int fd; |
386 | 386 | ||
387 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 387 | clk_arb_dbg(g, " "); |
388 | 388 | ||
389 | fd = nvgpu_clk_arb_install_fd(g, session, &completion_dev_ops, &dev); | 389 | fd = nvgpu_clk_arb_install_fd(g, session, &completion_dev_ops, &dev); |
390 | if (fd < 0) | 390 | if (fd < 0) |
@@ -403,7 +403,7 @@ int nvgpu_clk_arb_commit_request_fd(struct gk20a *g, | |||
403 | struct fd fd; | 403 | struct fd fd; |
404 | int err = 0; | 404 | int err = 0; |
405 | 405 | ||
406 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_clk_arb, " "); | 406 | clk_arb_dbg(g, " "); |
407 | 407 | ||
408 | fd = fdget(request_fd); | 408 | fd = fdget(request_fd); |
409 | if (!fd.file) | 409 | if (!fd.file) |
@@ -438,7 +438,7 @@ int nvgpu_clk_arb_set_session_target_mhz(struct nvgpu_clk_session *session, | |||
438 | struct fd fd; | 438 | struct fd fd; |
439 | int err = 0; | 439 | int err = 0; |
440 | 440 | ||
441 | nvgpu_log(session->g, gpu_dbg_fn | gpu_dbg_clk_arb, | 441 | clk_arb_dbg(session->g, |
442 | "domain=0x%08x target_mhz=%u", api_domain, target_mhz); | 442 | "domain=0x%08x target_mhz=%u", api_domain, target_mhz); |
443 | 443 | ||
444 | fd = fdget(request_fd); | 444 | fd = fdget(request_fd); |