Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/display: Use a reasonable timeout for framebuffer fence waits

Browse Source 
Patch '5edb0c9b Fix deadlock with display during hanged ring recovery'
was accidentaly removed during one of DALs code merges.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Andrey Grodzovsky 2019-04-15 10:57:14 -04:00 committed by Alex Deucher
parent 2fac0f53fe
commit f83088981a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5207,11 +5207,16 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
abo = gem_to_amdgpu_bo(fb->obj[0]); abo = gem_to_amdgpu_bo(fb->obj[0]);
/* Wait for all fences on this FB */ /*
* Wait for all fences on this FB. Do limited wait to avoid
* deadlock during GPU reset when this fence will not signal
* but we hold reservation lock for the BO.
*/
r = reservation_object_wait_timeout_rcu(abo->tbo.resv, true, r = reservation_object_wait_timeout_rcu(abo->tbo.resv, true,
false, false,
MAX_SCHEDULE_TIMEOUT); msecs_to_jiffies(5000));
WARN_ON(r < 0); if (unlikely(r <= 0))
DRM_ERROR("Waiting for fences timed out or interrupted!");
/* /*
* TODO This might fail and hence better not used, wait * TODO This might fail and hence better not used, wait
@ -5220,10 +5225,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
* blocking commit to as per framework helpers * blocking commit to as per framework helpers
*/ */
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);
}
amdgpu_bo_get_tiling_flags(abo, &tiling_flags); amdgpu_bo_get_tiling_flags(abo, &tiling_flags);