gpu: nvgpu: use nvgpu_current_time_ns in submit profiling

Replace Linux-specific and dubious sched_clock() with common
nvgpu_current_time_ns(). sched_clock() used also nanoseconds.

Jira NVGPU-708

Change-Id: I70f992fe42cc9c3ffed374fdebd582867475e84f
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1723202
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index 88bc2009..e2a10634 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -19,6 +19,7 @@
 #include <nvgpu/ltc.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/timers.h>
 
 /*
  * This is required for nvgpu_vm_find_buf() which is used in the tracing
@@ -817,7 +818,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
         }
 
         if (profile)
-                profile->timestamp[PROFILE_ENTRY] = sched_clock();
+                profile->timestamp[PROFILE_ENTRY] = nvgpu_current_time_ns();
 
         /* update debug settings */
         nvgpu_ltc_sync_enabled(g);
@@ -966,7 +967,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
         }
 
         if (profile)
-                profile->timestamp[PROFILE_JOB_TRACKING] = sched_clock();
+                profile->timestamp[PROFILE_JOB_TRACKING] = nvgpu_current_time_ns();
 
         if (wait_cmd)
                 gk20a_submit_append_priv_cmdbuf(c, wait_cmd);
@@ -991,7 +992,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
                 /* TODO! Check for errors... */
                 gk20a_channel_add_job(c, job, skip_buffer_refcounting);
         if (profile)
-                profile->timestamp[PROFILE_APPEND] = sched_clock();
+                profile->timestamp[PROFILE_APPEND] = nvgpu_current_time_ns();
 
         g->ops.fifo.userd_gp_put(g, c);
 
@@ -1010,7 +1011,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
                 c->gpfifo.put, c->gpfifo.get, c->gpfifo.entry_num);
 
         if (profile)
-                profile->timestamp[PROFILE_END] = sched_clock();
+                profile->timestamp[PROFILE_END] = nvgpu_current_time_ns();
         nvgpu_log_fn(g, "done");
         return err;
 
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 057c81e2..f93412c3 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -784,7 +784,7 @@ static int gk20a_ioctl_channel_submit_gpfifo(
         profile = gk20a_fifo_profile_acquire(ch->g);
 
         if (profile)
-                profile->timestamp[PROFILE_IOCTL_ENTRY] = sched_clock();
+                profile->timestamp[PROFILE_IOCTL_ENTRY] = nvgpu_current_time_ns();
 #endif
         if (ch->has_timedout)
                 return -ETIMEDOUT;
@@ -827,7 +827,7 @@ static int gk20a_ioctl_channel_submit_gpfifo(
         gk20a_fence_put(fence_out);
 #ifdef CONFIG_DEBUG_FS
         if (profile) {
-                profile->timestamp[PROFILE_IOCTL_EXIT] = sched_clock();
+                profile->timestamp[PROFILE_IOCTL_EXIT] = nvgpu_current_time_ns();
                 gk20a_fifo_profile_release(ch->g, profile);
         }
 #endif