aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/5693-drm-admkfd-use-modern-ktime-accessors.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5693-drm-admkfd-use-modern-ktime-accessors.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5693-drm-admkfd-use-modern-ktime-accessors.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5693-drm-admkfd-use-modern-ktime-accessors.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5693-drm-admkfd-use-modern-ktime-accessors.patch
new file mode 100644
index 00000000..2086c5ff
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5693-drm-admkfd-use-modern-ktime-accessors.patch
@@ -0,0 +1,47 @@
+From c56b97c38e22e14d2ba8a5f21cc2e9fe1b81f941 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 11 Jul 2018 14:41:00 +0200
+Subject: [PATCH 5693/5725] drm/admkfd use modern ktime accessors
+
+getrawmonotonic64() and get_monotonic_boottime64() are deprecated
+because of the nonstandard naming.
+
+The replacement functions ktime_get_raw_ns() and ktime_get_boot_ns()
+also simplify the callers.
+
+Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>.
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
+---
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+index 3b38253..759d59e 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+@@ -804,7 +804,6 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,
+ {
+ struct kfd_ioctl_get_clock_counters_args *args = data;
+ struct kfd_dev *dev;
+- struct timespec64 time;
+
+ dev = kfd_device_by_id(args->gpu_id);
+ if (dev)
+@@ -816,11 +815,8 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,
+ args->gpu_clock_counter = 0;
+
+ /* No access to rdtsc. Using raw monotonic time */
+- getrawmonotonic64(&time);
+- args->cpu_clock_counter = (uint64_t)timespec64_to_ns(&time);
+-
+- get_monotonic_boottime64(&time);
+- args->system_clock_counter = (uint64_t)timespec64_to_ns(&time);
++ args->cpu_clock_counter = ktime_get_raw_ns();
++ args->system_clock_counter = ktime_get_boot_ns();
+
+ /* Since the counter is in nano-seconds we use 1GHz frequency */
+ args->system_clock_freq = 1000000000;
+--
+2.7.4
+