Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0337976f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Oded Gabbay
Browse files

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: default avatarFelix Kuehling <Felix.Kuehling@amd.com&gt;.>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 6d52aacd

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+2 −6
Original line number Diff line number Diff line
@@ -754,7 +754,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)
@@ -766,11 +765,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;