Attachment 117555 Details for Bug 91527 – Maybe fix?

[patch] Maybe fix?

dolphin-radeon-patch (text/plain), 1.89 KB, created by JATothrim on 2015-08-05 23:39:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: JATothrim

Created: 2015-08-05 23:39:11 UTC

Size: 1.89 KB

patch

obsolete

>commit 642069bc2effc27ac9396e1bfd30a8d8893b1501
>Author: Christian KÃ¶nig <christian.koenig@amd.com>
>Date:   Tue Mar 31 17:36:58 2015 +0200
>
>    drm/radeon: fix wait in radeon_mn_invalidate_range_start
>    
>    [ Upstream commit 22e2e86560c5fca6f9b9d078f221fcdab9947a5e ]
>    
>    We need to wait for all fences, not just the exclusive one.
>    
>    Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>    Cc: <stable@vger.kernel.org>
>    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
>
>diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
>index a69bd44..572b4db 100644
>--- a/drivers/gpu/drm/radeon/radeon_mn.c
>+++ b/drivers/gpu/drm/radeon/radeon_mn.c
>@@ -122,7 +122,6 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
>        it = interval_tree_iter_first(&rmn->objects, start, end);
>        while (it) {
>                struct radeon_bo *bo;
>-               struct fence *fence;
>                int r;
> 
>                bo = container_of(it, struct radeon_bo, mn_it);
>@@ -134,12 +133,10 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
>                        continue;
>                }
> 
>-               fence = reservation_object_get_excl(bo->tbo.resv);
>-               if (fence) {
>-                       r = radeon_fence_wait((struct radeon_fence *)fence, false);
>-                       if (r)
>-                               DRM_ERROR("(%d) failed to wait for user bo\n", r);
>-               }
>+               r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true,
>+                       false, MAX_SCHEDULE_TIMEOUT);
>+               if (r)
>+                       DRM_ERROR("(%d) failed to wait for user bo\n", r);
> 
>                radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_CPU);
>                r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
>

Actions: View | Splinter Review

Attachments on bug 91527: 117497 | 117498 | 117555

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.