openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: wait for fence without holding reservation lock 

Don't block others while waiting for the fences to finish, concurrent
submission is perfectly valid in this case and holding the lock can
prevent killed applications from terminating.

Signed-off-by: Christian König <ckoenig.leichtzumerken@gmail.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2019-04-02 16:28:13 +02:00 committed by Alex Deucher
parent 77e7f82985
commit 2fac0f53fe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -5205,23 +5205,26 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
continue; continue;
} }
abo = gem_to_amdgpu_bo(fb->obj[0]);
/* Wait for all fences on this FB */
r = reservation_object_wait_timeout_rcu(abo->tbo.resv, true,
false,
MAX_SCHEDULE_TIMEOUT);
WARN_ON(r < 0);
/* /*
* TODO This might fail and hence better not used, wait * TODO This might fail and hence better not used, wait
* explicitly on fences instead * explicitly on fences instead
* and in general should be called for * and in general should be called for
* blocking commit to as per framework helpers * blocking commit to as per framework helpers
*/ */
abo = gem_to_amdgpu_bo(fb->obj[0]);
r = amdgpu_bo_reserve(abo, true); r = amdgpu_bo_reserve(abo, true);
if (unlikely(r != 0)) { if (unlikely(r != 0)) {
DRM_ERROR("failed to reserve buffer before flip\n"); DRM_ERROR("failed to reserve buffer before flip\n");
WARN_ON(1); WARN_ON(1);
} }
/* Wait for all fences on this FB */
WARN_ON(reservation_object_wait_timeout_rcu(abo->tbo.resv, true, false,
MAX_SCHEDULE_TIMEOUT) < 0);
amdgpu_bo_get_tiling_flags(abo, &tiling_flags); amdgpu_bo_get_tiling_flags(abo, &tiling_flags);
amdgpu_bo_unreserve(abo); amdgpu_bo_unreserve(abo);