Commit 9066b0c3 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher

drm/amdgpu: fix no sync_wait in copy_buffer

when eviction is happening, if don't handle
dependency, then the fence could be dead off.
Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarChristian K?nig <christian.koenig@amd.com>
parent 3c62338c
...@@ -1014,13 +1014,19 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, ...@@ -1014,13 +1014,19 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring,
/* for fence and sync */ /* for fence and sync */
num_dw += 64 + AMDGPU_NUM_SYNCS * 8; num_dw += 64 + AMDGPU_NUM_SYNCS * 8;
r = amdgpu_sync_wait(&sync);
if (r) {
DRM_ERROR("sync wait failed (%d).\n", r);
amdgpu_sync_free(adev, &sync, NULL);
return r;
}
r = amdgpu_ring_lock(ring, num_dw); r = amdgpu_ring_lock(ring, num_dw);
if (r) { if (r) {
DRM_ERROR("ring lock failed (%d).\n", r); DRM_ERROR("ring lock failed (%d).\n", r);
amdgpu_sync_free(adev, &sync, NULL); amdgpu_sync_free(adev, &sync, NULL);
return r; return r;
} }
amdgpu_sync_rings(&sync, ring); amdgpu_sync_rings(&sync, ring);
for (i = 0; i < num_loops; i++) { for (i = 0; i < num_loops; i++) {
......
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