Commit b56c2285 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: use fence_is_later() for vm_flush as well v2

v2: remove superfluous check
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
parent c2776afe
...@@ -207,24 +207,21 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, ...@@ -207,24 +207,21 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring,
uint64_t pd_addr = amdgpu_bo_gpu_offset(vm->page_directory); uint64_t pd_addr = amdgpu_bo_gpu_offset(vm->page_directory);
struct amdgpu_vm_id *vm_id = &vm->ids[ring->idx]; struct amdgpu_vm_id *vm_id = &vm->ids[ring->idx];
struct fence *flushed_updates = vm_id->flushed_updates; struct fence *flushed_updates = vm_id->flushed_updates;
bool is_earlier = false; bool is_later;
if (flushed_updates && updates) { if (!flushed_updates)
BUG_ON(flushed_updates->context != updates->context); is_later = true;
is_earlier = (updates->seqno - flushed_updates->seqno <= else if (!updates)
INT_MAX) ? true : false; is_later = false;
} else
is_later = fence_is_later(updates, flushed_updates);
if (pd_addr != vm_id->pd_gpu_addr || !flushed_updates ||
is_earlier) {
if (pd_addr != vm_id->pd_gpu_addr || is_later) {
trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id->id); trace_amdgpu_vm_flush(pd_addr, ring->idx, vm_id->id);
if (is_earlier) { if (is_later) {
vm_id->flushed_updates = fence_get(updates); vm_id->flushed_updates = fence_get(updates);
fence_put(flushed_updates); fence_put(flushed_updates);
} }
if (!flushed_updates)
vm_id->flushed_updates = fence_get(updates);
vm_id->pd_gpu_addr = pd_addr; vm_id->pd_gpu_addr = pd_addr;
amdgpu_ring_emit_vm_flush(ring, vm_id->id, vm_id->pd_gpu_addr); amdgpu_ring_emit_vm_flush(ring, vm_id->id, vm_id->pd_gpu_addr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment