Browse Source

drm/amdgpu: fix type mismatch error

remaining timeout returned by amdgpu_fence_wait_any can be larger than
max int value, thus the truncated 32 bit value in r ends up being
negative while its original long value is positive.

Signed-off-by: monk.liu <monk.liu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <jammy.zhou@amd.com>
monk.liu 10 years ago
parent
commit
a8f5bf0b22
1 changed files with 3 additions and 2 deletions
  1. 3 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c

+ 3 - 2
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c

@@ -318,6 +318,7 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
 	struct amdgpu_fence *fences[AMDGPU_MAX_RINGS];
 	struct amdgpu_fence *fences[AMDGPU_MAX_RINGS];
 	unsigned tries[AMDGPU_MAX_RINGS];
 	unsigned tries[AMDGPU_MAX_RINGS];
 	int i, r;
 	int i, r;
+	signed long t;
 
 
 	BUG_ON(align > sa_manager->align);
 	BUG_ON(align > sa_manager->align);
 	BUG_ON(size > sa_manager->size);
 	BUG_ON(size > sa_manager->size);
@@ -351,8 +352,8 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
 		} while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries));
 		} while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries));
 
 
 		spin_unlock(&sa_manager->wq.lock);
 		spin_unlock(&sa_manager->wq.lock);
-		r = amdgpu_fence_wait_any(adev, fences, false, MAX_SCHEDULE_TIMEOUT);
-		r = (r > 0) ? 0 : r;
+		t = amdgpu_fence_wait_any(adev, fences, false, MAX_SCHEDULE_TIMEOUT);
+		r = (t > 0) ? 0 : t;
 		spin_lock(&sa_manager->wq.lock);
 		spin_lock(&sa_manager->wq.lock);
 		/* if we have nothing to wait for block */
 		/* if we have nothing to wait for block */
 		if (r == -ENOENT) {
 		if (r == -ENOENT) {