aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
diff options
context:
space:
mode:
authormonk.liu <monk.liu@amd.com>2015-08-12 05:56:52 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:51:18 -0400
commita8f5bf0b220c28b1b600a5ff3cae0b53c5c2079b (patch)
tree3c28ba201e8292a315029ed229128679d2da5825 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
parent281b42230175608dec0cd8dab9908250e7aa36a9 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
index c5b17262529d..d6398cf45f24 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
@@ -318,6 +318,7 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
318 struct amdgpu_fence *fences[AMDGPU_MAX_RINGS]; 318 struct amdgpu_fence *fences[AMDGPU_MAX_RINGS];
319 unsigned tries[AMDGPU_MAX_RINGS]; 319 unsigned tries[AMDGPU_MAX_RINGS];
320 int i, r; 320 int i, r;
321 signed long t;
321 322
322 BUG_ON(align > sa_manager->align); 323 BUG_ON(align > sa_manager->align);
323 BUG_ON(size > sa_manager->size); 324 BUG_ON(size > sa_manager->size);
@@ -351,8 +352,8 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
351 } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries)); 352 } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries));
352 353
353 spin_unlock(&sa_manager->wq.lock); 354 spin_unlock(&sa_manager->wq.lock);
354 r = amdgpu_fence_wait_any(adev, fences, false, MAX_SCHEDULE_TIMEOUT); 355 t = amdgpu_fence_wait_any(adev, fences, false, MAX_SCHEDULE_TIMEOUT);
355 r = (r > 0) ? 0 : r; 356 r = (t > 0) ? 0 : t;
356 spin_lock(&sa_manager->wq.lock); 357 spin_lock(&sa_manager->wq.lock);
357 /* if we have nothing to wait for block */ 358 /* if we have nothing to wait for block */
358 if (r == -ENOENT) { 359 if (r == -ENOENT) {