mirror of https://gitee.com/openkylin/linux.git
drm/amdgpu: fix syncing to VM updates
Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
afe1008149
commit
1d3897e056
drivers/gpu/drm/amd/amdgpu
|
@ -122,11 +122,24 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
|
|||
f = rcu_dereference_protected(flist->shared[i],
|
||||
reservation_object_held(resv));
|
||||
fence = f ? to_amdgpu_fence(f) : NULL;
|
||||
if (fence && fence->ring->adev == adev &&
|
||||
fence->owner == owner &&
|
||||
fence->owner != AMDGPU_FENCE_OWNER_UNDEFINED)
|
||||
if (fence && fence->ring->adev == adev) {
|
||||
/* VM updates are only interesting
|
||||
* for other VM updates and moves.
|
||||
*/
|
||||
if ((owner != AMDGPU_FENCE_OWNER_MOVE) &&
|
||||
(fence->owner != AMDGPU_FENCE_OWNER_MOVE) &&
|
||||
((owner == AMDGPU_FENCE_OWNER_VM) !=
|
||||
(fence->owner == AMDGPU_FENCE_OWNER_VM)))
|
||||
continue;
|
||||
|
||||
/* Ignore fence from the same owner as
|
||||
* long as it isn't undefined.
|
||||
*/
|
||||
if (owner != AMDGPU_FENCE_OWNER_UNDEFINED &&
|
||||
fence->owner == owner)
|
||||
continue;
|
||||
}
|
||||
|
||||
r = amdgpu_sync_fence(adev, sync, f);
|
||||
if (r)
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue