Attachment 119927 Details for Bug 92258 – Use reservation_object_wait_timeout_rcu

[patch] Use reservation_object_wait_timeout_rcu

file_92258.txt (text/plain), 1.57 KB, created by Maarten Lankhorst on 2015-11-19 08:23:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten Lankhorst

Created: 2015-11-19 08:23:19 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>index 745e996d2dbc..93511cc939aa 100644
>--- a/drivers/gpu/drm/ttm/ttm_bo.c
>+++ b/drivers/gpu/drm/ttm/ttm_bo.c
>@@ -1538,38 +1538,9 @@ EXPORT_SYMBOL(ttm_bo_unmap_virtual);
> int ttm_bo_wait(struct ttm_buffer_object *bo,
> 		bool lazy, bool interruptible, bool no_wait)
> {
>-	struct reservation_object_list *fobj;
>-	struct reservation_object *resv;
>-	struct fence *excl;
>-	long timeout = 15 * HZ;
>-	int i;
>-
>-	resv = bo->resv;
>-	fobj = reservation_object_get_list(resv);
>-	excl = reservation_object_get_excl(resv);
>-	if (excl) {
>-		if (!fence_is_signaled(excl)) {
>-			if (no_wait)
>-				return -EBUSY;
>-
>-			timeout = fence_wait_timeout(excl,
>-						     interruptible, timeout);
>-		}
>-	}
>+	long timeout = no_wait ? 0 : 15 * HZ;
> 
>-	for (i = 0; fobj && timeout > 0 && i < fobj->shared_count; ++i) {
>-		struct fence *fence;
>-		fence = rcu_dereference_protected(fobj->shared[i],
>-						reservation_object_held(resv));
>-
>-		if (!fence_is_signaled(fence)) {
>-			if (no_wait)
>-				return -EBUSY;
>-
>-			timeout = fence_wait_timeout(fence,
>-						     interruptible, timeout);
>-		}
>-	}
>+	timeout = reservation_object_wait_timeout_rcu(bo->resv, true, interruptible, timeout);
> 
> 	if (timeout < 0)
> 		return timeout;
>@@ -1577,7 +1548,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,
> 	if (timeout == 0)
> 		return -EBUSY;
> 
>-	reservation_object_add_excl_fence(resv, NULL);
>+	reservation_object_add_excl_fence(bo->resv, NULL);
> 	clear_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);
> 	return 0;
> }

Actions: View | Splinter Review

Attachments on bug 92258: 118630 | 118908 | 119927 | 122639 | 122647

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.