Attachment 67047 Details for Bug 51344 – Possible fix

[patch] Possible fix

0001-drm-radeon-make-64bit-fences-more-robust-v3.patch (text/plain), 1.76 KB, created by Christian König on 2012-09-12 11:49:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2012-09-12 11:49:46 UTC

Size: 1.76 KB

patch

obsolete

>From 4ceaacddd46df3def1697914fecf8ad3ef641527 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <deathsimple@vodafone.de>
>Date: Sun, 9 Sep 2012 11:45:19 +0200
>Subject: [PATCH] drm/radeon: make 64bit fences more robust v3
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Only increase the higher 32bits if we really detect a wrap around.
>
>v2: instead of increasing the higher 32bits just use the higher
>    32bits from the last emitted fence.
>v3: also use last emitted fence value as upper limit.
>
>Signed-off-by: Christian KÃ¶nig <deathsimple@vodafone.de>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_fence.c |    8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
>index 7b737b9..2a59375 100644
>--- a/drivers/gpu/drm/radeon/radeon_fence.c
>+++ b/drivers/gpu/drm/radeon/radeon_fence.c
>@@ -131,7 +131,7 @@ int radeon_fence_emit(struct radeon_device *rdev,
>  */
> void radeon_fence_process(struct radeon_device *rdev, int ring)
> {
>-	uint64_t seq, last_seq;
>+	uint64_t seq, last_seq, last_emitted;
> 	unsigned count_loop = 0;
> 	bool wake = false;
> 
>@@ -158,13 +158,15 @@ void radeon_fence_process(struct radeon_device *rdev, int ring)
> 	 */
> 	last_seq = atomic64_read(&rdev->fence_drv[ring].last_seq);
> 	do {
>+		last_emitted = rdev->fence_drv[ring].sync_seq[ring];
> 		seq = radeon_fence_read(rdev, ring);
> 		seq |= last_seq & 0xffffffff00000000LL;
> 		if (seq < last_seq) {
>-			seq += 0x100000000LL;
>+			seq &= 0xffffffff;
>+			seq |= last_emitted & 0xffffffff00000000LL;
> 		}
> 
>-		if (seq == last_seq) {
>+		if (seq <= last_seq || seq > last_emitted) {
> 			break;
> 		}
> 		/* If we loop over we don't want to return without
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 51344: 63356 | 63357 | 63359 | 66942 | 66986 | 67047

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.