drm/amdgpu: remove the unnecessary parameter adev for amdgpu_fence_wait_any()
authorJunwei Zhang <Jerry.Zhang@amd.com>
Sun, 6 Sep 2015 05:55:03 +0000 (13:55 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 21 Oct 2015 15:35:13 +0000 (11:35 -0400)
Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c

index 39d96088f7b46a97e04e783bd183583390a63867..a9c0def6ce31f2ffb947e523be449717da6ba7db 100644 (file)
@@ -447,8 +447,7 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring);
 int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
 unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring);
 
-signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,
-                                 struct fence **array,
+signed long amdgpu_fence_wait_any(struct fence **array,
                                  uint32_t count,
                                  bool intr,
                                  signed long t);
index 1fadc15e64aef248dd727efe028ec2b364c4c909..003a219943f1082e5a26b5453cab097b5c5f21eb 100644 (file)
@@ -857,16 +857,12 @@ static void amdgpu_fence_wait_cb(struct fence *fence, struct fence_cb *cb)
 static signed long amdgpu_fence_default_wait(struct fence *f, bool intr,
                                             signed long t)
 {
-       struct amdgpu_fence *fence = to_amdgpu_fence(f);
-       struct amdgpu_device *adev = fence->ring->adev;
-
-       return amdgpu_fence_wait_any(adev, &f, 1, intr, t);
+       return amdgpu_fence_wait_any(&f, 1, intr, t);
 }
 
 /**
  * Wait the fence array with timeout
  *
- * @adev:     amdgpu device
  * @array:    the fence array with amdgpu fence pointer
  * @count:    the number of the fence array
  * @intr:     when sleep, set the current task interruptable or not
@@ -874,8 +870,7 @@ static signed long amdgpu_fence_default_wait(struct fence *f, bool intr,
  *
  * It will return when any fence is signaled or timeout.
  */
-signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,
-                                 struct fence **array, uint32_t count,
+signed long amdgpu_fence_wait_any(struct fence **array, uint32_t count,
                                  bool intr, signed long t)
 {
        struct amdgpu_wait_cb *cb;
index e90712443fe92ac87bd808ffe65957f8320abb72..5cb27d525e43126a2f0c1f85cb0d09faa0b8a5cc 100644 (file)
@@ -372,7 +372,7 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
                } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries));
 
                spin_unlock(&sa_manager->wq.lock);
-               t = amdgpu_fence_wait_any(adev, fences, AMDGPU_MAX_RINGS,
+               t = amdgpu_fence_wait_any(fences, AMDGPU_MAX_RINGS,
                                          false, MAX_SCHEDULE_TIMEOUT);
                r = (t > 0) ? 0 : t;
                spin_lock(&sa_manager->wq.lock);