leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: re-work sync_resv

Browse Source 
sync_resv is to handle both amdgpu_fence and sched_fence.

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian K?nig <christian.koenig@amd.com>
This commit is contained in:
Chunming Zhou 2015-08-24 16:59:54 +08:00 committed by Alex Deucher
parent e39daf2c63
commit 423a9480ad
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,18 @@ 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 - use the semaphores to sync to a reservation object * amdgpu_sync_resv - use the semaphores to sync to a reservation object
* *
@ -158,7 +170,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
{ {
struct reservation_object_list *flist; struct reservation_object_list *flist;
struct fence *f; struct fence *f;
struct amdgpu_fence *fence; void *fence_owner;
unsigned i; unsigned i;
int r = 0; int r = 0;
@ -176,22 +188,22 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
for (i = 0; i < flist->shared_count; ++i) { for (i = 0; i < flist->shared_count; ++i) {
f = rcu_dereference_protected(flist->shared[i], f = rcu_dereference_protected(flist->shared[i],
reservation_object_held(resv)); reservation_object_held(resv));
fence = f ? to_amdgpu_fence(f) : NULL; if (amdgpu_sync_same_dev(adev, f)) {
if (fence && fence->ring->adev == adev) {
/* VM updates are only interesting /* VM updates are only interesting
* for other VM updates and moves. * for other VM updates and moves.
*/ */
fence_owner = amdgpu_sync_get_owner(f);
if ((owner != AMDGPU_FENCE_OWNER_MOVE) && if ((owner != AMDGPU_FENCE_OWNER_MOVE) &&
(fence->owner != AMDGPU_FENCE_OWNER_MOVE) && (fence_owner != AMDGPU_FENCE_OWNER_MOVE) &&
((owner == AMDGPU_FENCE_OWNER_VM) != ((owner == AMDGPU_FENCE_OWNER_VM) !=
(fence->owner == AMDGPU_FENCE_OWNER_VM))) (fence_owner == AMDGPU_FENCE_OWNER_VM)))
continue; continue;
/* Ignore fence from the same owner as /* Ignore fence from the same owner as
* long as it isn't undefined. * long as it isn't undefined.
*/ */
if (owner != AMDGPU_FENCE_OWNER_UNDEFINED && if (owner != AMDGPU_FENCE_OWNER_UNDEFINED &&
fence->owner == owner) fence_owner == owner)
continue; continue;
} }