UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: remove the unnecessary parameter adev for amdgpu_fence_wait_any() 

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Junwei Zhang 2015-09-06 13:55:03 +08:00 committed by Alex Deucher
parent 0c418f1010
commit ce16b0e5a3
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/amdgpu/amdgpu.h
View File

@ -447,8 +447,7 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring);
int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring);
signed long amdgpu_fence_wait_any(struct amdgpu_device *adev, signed long amdgpu_fence_wait_any(struct fence **array,
struct fence **array,
uint32_t count, uint32_t count,
bool intr, bool intr,
signed long t); signed long t);

9
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
View 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, static signed long amdgpu_fence_default_wait(struct fence *f, bool intr,
signed long t) signed long t)
{ {
struct amdgpu_fence *fence = to_amdgpu_fence(f); return amdgpu_fence_wait_any(&f, 1, intr, t);
struct amdgpu_device *adev = fence->ring->adev;
return amdgpu_fence_wait_any(adev, &f, 1, intr, t);
} }
/** /**
* Wait the fence array with timeout * Wait the fence array with timeout
* *
* @adev: amdgpu device
* @array: the fence array with amdgpu fence pointer * @array: the fence array with amdgpu fence pointer
* @count: the number of the fence array * @count: the number of the fence array
* @intr: when sleep, set the current task interruptable or not * @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. * It will return when any fence is signaled or timeout.
*/ */
signed long amdgpu_fence_wait_any(struct amdgpu_device *adev, signed long amdgpu_fence_wait_any(struct fence **array, uint32_t count,
struct fence **array, uint32_t count,
bool intr, signed long t) bool intr, signed long t)
{ {
struct amdgpu_wait_cb *cb; struct amdgpu_wait_cb *cb;

2
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
View File

@ -372,7 +372,7 @@ 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);
t = amdgpu_fence_wait_any(adev, fences, AMDGPU_MAX_RINGS, t = amdgpu_fence_wait_any(fences, AMDGPU_MAX_RINGS,
false, MAX_SCHEDULE_TIMEOUT); false, MAX_SCHEDULE_TIMEOUT);
r = (t > 0) ? 0 : t; r = (t > 0) ? 0 : t;
spin_lock(&sa_manager->wq.lock); spin_lock(&sa_manager->wq.lock);