Attachment 143898 Details for Bug 109692 – [PATCH] drm_amd_display: wait for fence without holding reservation lock.patch

[patch] [PATCH] drm_amd_display: wait for fence without holding reservation lock.patch

[PATCH] drm_amd_display: wait for fence without holding reservation lock.patch (text/plain), 1.56 KB, created by Andrey Grodzovsky on 2019-04-08 14:48:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Grodzovsky

Created: 2019-04-08 14:48:19 UTC

Size: 1.56 KB

patch

obsolete

>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 <christian.koenig@amd.com>
>---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>index 697af51d403a..9426e701a7b6 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -5129,23 +5129,26 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
> 			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
> 		 * explicitly on fences instead
> 		 * and in general should be called for
> 		 * blocking commit to as per framework helpers
> 		 */
>-		abo = gem_to_amdgpu_bo(fb->obj[0]);
> 		r = amdgpu_bo_reserve(abo, true);
> 		if (unlikely(r != 0)) {
> 			DRM_ERROR("failed to reserve buffer before flip\n");
> 			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_unreserve(abo);
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 109692: 143419 | 143422 | 143423 | 143476 | 143485 | 143497 | 143882 | 143883 | 143886 | 143897 | 143898 | 143904 | 143908 | 143927 | 143928 | 144242

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.