aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorOded Gabbay <oded.gabbay@amd.com>2015-02-26 14:24:44 -0500
committerOded Gabbay <oded.gabbay@amd.com>2015-03-25 08:02:05 -0400
commita9243ede5d5797bacb846a09169aa0a514439fe9 (patch)
treeb4474a91c5a4e21276fc8003ec0a6886f0a62a1f /drivers/gpu/drm/amd
parentae10c2248593fb84c6951d67c98c9c934997e56a (diff)
drm/amdkfd: rename fence_wait_timeout
fence_wait_timeout() is an exported kernel symbol, so we should rename our local function to something different. Signed-off-by: Oded Gabbay <oded.gabbay@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 910ff8ab9c9c..be68d58b564e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -897,7 +897,7 @@ out:
897 return retval; 897 return retval;
898} 898}
899 899
900static int fence_wait_timeout(unsigned int *fence_addr, 900static int amdkfd_fence_wait_timeout(unsigned int *fence_addr,
901 unsigned int fence_value, 901 unsigned int fence_value,
902 unsigned long timeout) 902 unsigned long timeout)
903{ 903{
@@ -953,7 +953,7 @@ static int destroy_queues_cpsch(struct device_queue_manager *dqm, bool lock)
953 pm_send_query_status(&dqm->packets, dqm->fence_gpu_addr, 953 pm_send_query_status(&dqm->packets, dqm->fence_gpu_addr,
954 KFD_FENCE_COMPLETED); 954 KFD_FENCE_COMPLETED);
955 /* should be timed out */ 955 /* should be timed out */
956 fence_wait_timeout(dqm->fence_addr, KFD_FENCE_COMPLETED, 956 amdkfd_fence_wait_timeout(dqm->fence_addr, KFD_FENCE_COMPLETED,
957 QUEUE_PREEMPT_DEFAULT_TIMEOUT_MS); 957 QUEUE_PREEMPT_DEFAULT_TIMEOUT_MS);
958 pm_release_ib(&dqm->packets); 958 pm_release_ib(&dqm->packets);
959 dqm->active_runlist = false; 959 dqm->active_runlist = false;