From: "Christian König" <deathsimple@vodafone.de>
To: dri-devel@lists.freedesktop.org, airlied@gmail.com
Subject: [PATCH] drm/radeon: make 64bit fences more robust
Date: Mon, 10 Sep 2012 11:13:03 +0200 [thread overview]
Message-ID: <1347268383-4150-1-git-send-email-deathsimple@vodafone.de> (raw)
Only increase the higher 32bits if we really detect a wrap around.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=54129
https://bugs.freedesktop.org/show_bug.cgi?id=54662
Possible fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=846505
https://bugzilla.redhat.com/show_bug.cgi?id=845639
Signed-off-by: Christian König <deathsimple@vodafone.de>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/radeon/radeon_fence.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 7b737b9..4781e13 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -160,7 +160,7 @@ void radeon_fence_process(struct radeon_device *rdev, int ring)
do {
seq = radeon_fence_read(rdev, ring);
seq |= last_seq & 0xffffffff00000000LL;
- if (seq < last_seq) {
+ if (seq < (last_seq - 0x80000000LL)) {
seq += 0x100000000LL;
}
@@ -811,8 +811,8 @@ static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)
rdev->fence_drv[ring].cpu_addr = NULL;
rdev->fence_drv[ring].gpu_addr = 0;
for (i = 0; i < RADEON_NUM_RINGS; ++i)
- rdev->fence_drv[ring].sync_seq[i] = 0;
- atomic64_set(&rdev->fence_drv[ring].last_seq, 0);
+ rdev->fence_drv[ring].sync_seq[i] = 0x100000000LL;
+ atomic64_set(&rdev->fence_drv[ring].last_seq, 0x100000000LL);
rdev->fence_drv[ring].last_activity = jiffies;
rdev->fence_drv[ring].initialized = false;
}
--
1.7.9.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2012-09-10 9:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 9:13 Christian König [this message]
2012-09-10 11:12 ` [PATCH] drm/radeon: make 64bit fences more robust Michel Dänzer
2012-09-10 12:02 ` Christian König
2012-09-10 15:32 ` Jerome Glisse
2012-09-10 15:38 ` Michel Dänzer
2012-09-10 15:52 ` Jerome Glisse
2012-09-10 16:07 ` Jerome Glisse
2012-09-10 20:13 ` Dave Airlie
2012-09-10 21:10 ` Jerome Glisse
2012-09-10 21:11 ` Jerome Glisse
2012-09-11 10:11 ` Christian König
2012-09-11 10:23 ` Michel Dänzer
2012-09-11 16:03 ` Jerome Glisse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347268383-4150-1-git-send-email-deathsimple@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.