hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: cleanup the sync code 

No need for two functions doing the same, remove one and
add comments what those functions actually do.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
This commit is contained in:
Christian König 2016-02-16 16:23:02 +01:00 committed by Alex Deucher
parent 637dd3b5ca
commit bcc634f4a8
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
View File

@ -50,6 +50,14 @@ void amdgpu_sync_create(struct amdgpu_sync *sync)
sync->last_vm_update = NULL; sync->last_vm_update = NULL;
} }
/**
* amdgpu_sync_same_dev - test if fence belong to us
*
* @adev: amdgpu device to use for the test
* @f: fence to test
*
* Test if the fence was issued by us.
*/
static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, struct fence *f) static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, struct fence *f)
{ {
struct amdgpu_fence *a_fence = to_amdgpu_fence(f); struct amdgpu_fence *a_fence = to_amdgpu_fence(f);
@ -68,17 +76,33 @@ static bool amdgpu_sync_same_dev(struct amdgpu_device *adev, struct fence *f)
return false; return false;
} }
static bool amdgpu_sync_test_owner(struct fence *f, void *owner) /**
* amdgpu_sync_get_owner - extract the owner of a fence
*
* @fence: fence get the owner from
*
* Extract who originally created the fence.
*/
static void *amdgpu_sync_get_owner(struct fence *f)
{ {
struct amdgpu_fence *a_fence = to_amdgpu_fence(f); struct amdgpu_fence *a_fence = to_amdgpu_fence(f);
struct amd_sched_fence *s_fence = to_amd_sched_fence(f); struct amd_sched_fence *s_fence = to_amd_sched_fence(f);
if (s_fence) if (s_fence)
return s_fence->owner == owner; return s_fence->owner;
if (a_fence) else if (a_fence)
return a_fence->owner == owner; return a_fence->owner;
return false; return AMDGPU_FENCE_OWNER_UNDEFINED;
} }
/**
* amdgpu_sync_keep_later - Keep the later fence
*
* @keep: existing fence to test
* @fence: new fence
*
* Either keep the existing fence or the new one, depending which one is later.
*/
static void amdgpu_sync_keep_later(struct fence **keep, struct fence *fence) static void amdgpu_sync_keep_later(struct fence **keep, struct fence *fence)
{ {
if (*keep && fence_is_later(*keep, fence)) if (*keep && fence_is_later(*keep, fence))
@ -104,7 +128,7 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync,
return 0; return 0;
if (amdgpu_sync_same_dev(adev, f) && if (amdgpu_sync_same_dev(adev, f) &&
amdgpu_sync_test_owner(f, AMDGPU_FENCE_OWNER_VM)) amdgpu_sync_get_owner(f) == AMDGPU_FENCE_OWNER_VM)
amdgpu_sync_keep_later(&sync->last_vm_update, f); amdgpu_sync_keep_later(&sync->last_vm_update, f);
hash_for_each_possible(sync->fences, e, node, f->context) { hash_for_each_possible(sync->fences, e, node, f->context) {
@ -124,18 +148,6 @@ int amdgpu_sync_fence(struct amdgpu_device *adev, struct amdgpu_sync *sync,
return 0; return 0;
} }
static void *amdgpu_sync_get_owner(struct fence *f)
{
struct amdgpu_fence *a_fence = to_amdgpu_fence(f);
struct amd_sched_fence *s_fence = to_amd_sched_fence(f);
if (s_fence)
return s_fence->owner;
else if (a_fence)
return a_fence->owner;
return AMDGPU_FENCE_OWNER_UNDEFINED;
}
/** /**
* amdgpu_sync_resv - sync to a reservation object * amdgpu_sync_resv - sync to a reservation object
* *