summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJammy Zhou <Jammy.Zhou@amd.com>2015-06-05 18:22:01 +0800
committerJammy Zhou <Jammy.Zhou@amd.com>2015-06-05 18:22:01 +0800
commit5c2d5a642449d23b1918b929d38774170f8a8f02 (patch)
treebf048e968b657c45932e7f9a7668c9df00e3138f
parentc0777af131c4a7c6d3d1d9de6205d2cdcf58f719 (diff)
parent74bce88e1c3e79933386e9b43c4126f3596dc537 (diff)
Merge 'amd-staging-upstream' into amd-mainline
-rw-r--r--amdgpu/amdgpu_cs.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c
index 5e406e8b..44e132cc 100644
--- a/amdgpu/amdgpu_cs.c
+++ b/amdgpu/amdgpu_cs.c
@@ -900,6 +900,11 @@ int amdgpu_cs_query_fence_status(struct amdgpu_cs_query_fence *fence,
return 0;
}
+ if (fence->timeout_ns == 0) {
+ pthread_mutex_unlock(&context->sequence_mutex);
+ return 0;
+ }
+
pthread_mutex_unlock(&context->sequence_mutex);
r = amdgpu_ioctl_wait_cs(context, ip_type, ip_instance, ring,