evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/amdgpu: fix no sync_wait in copy_buffer

Browse source 
when eviction is happening, if don't handle
dependency, then the fence could be dead off.

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-25 15:12:26 +08:00 • committed by Alex Deucher
parent 3c62338c26
commit 9066b0c318
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View file

@ -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++) {