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

Commit 8c72c3d7 authored Sep 20, 2017 by Yong Zhao Committed by Oded Gabbay Sep 20, 2017

drm/amdkfd: Rectify the jiffies calculation error with milliseconds v2



The timeout in milliseconds should not be regarded as jiffies. This
commit fixed that.

v2:
- use msecs_to_jiffies
- change timeout_ms parameter to unsigned int to match msecs_to_jiffies

Signed-off-by: Yong Zhao <yong.zhao@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

parent 733fa1f7

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -835,12 +835,12 @@ static int create_queue_cpsch(struct device_queue_manager dqm, struct queue q,

		int amdkfd_fence_wait_timeout(unsigned int *fence_addr,
		unsigned int fence_value,
		unsigned long timeout)
		unsigned int timeout_ms)
		{
		timeout += jiffies;
		unsigned long end_jiffies = msecs_to_jiffies(timeout_ms) + jiffies;

		while (*fence_addr != fence_value) {
		if (time_after(jiffies, timeout)) {
		if (time_after(jiffies, end_jiffies)) {
		pr_err("qcm fence wait loop timeout expired\n");
		return -ETIME;
		}

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -672,7 +672,7 @@ struct kernel_queue pqm_get_kernel_queue(struct process_queue_manager pqm,

		int amdkfd_fence_wait_timeout(unsigned int *fence_addr,
		unsigned int fence_value,
		unsigned long timeout);
		unsigned int timeout_ms);

		/* Packet Manager */