public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: Handle sync_seqno correctly when seqno has wrapped.
Date: Tue, 13 Nov 2012 15:51:36 +0200	[thread overview]
Message-ID: <1352814696-2154-1-git-send-email-mika.kuoppala@intel.com> (raw)

If seqno has wrapped, normal compare operation will give wrong results.
i915_seqno_passed can handle the wrap so use it instead.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cdcf19d..35d5db8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2138,7 +2138,7 @@ i915_gem_retire_requests_ring(struct intel_ring_buffer *ring)
 	seqno = ring->get_seqno(ring, true);
 
 	for (i = 0; i < ARRAY_SIZE(ring->sync_seqno); i++)
-		if (seqno >= ring->sync_seqno[i])
+		if (i915_seqno_passed(seqno, ring->sync_seqno[i]))
 			ring->sync_seqno[i] = 0;
 
 	while (!list_empty(&ring->request_list)) {
@@ -2376,7 +2376,7 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj,
 	idx = intel_ring_sync_index(from, to);
 
 	seqno = obj->last_read_seqno;
-	if (seqno <= from->sync_seqno[idx])
+	if (i915_seqno_passed(from->sync_seqno[idx], seqno))
 		return 0;
 
 	ret = i915_gem_check_olr(obj->ring, seqno);
-- 
1.7.9.5

             reply	other threads:[~2012-11-13 13:51 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-13 13:51 Mika Kuoppala [this message]
2012-11-13 14:15 ` [PATCH] drm/i915: Handle sync_seqno correctly when seqno has wrapped Chris Wilson
2012-11-13 16:39 ` Ben Widawsky
2012-11-13 16:45   ` Daniel Vetter
2012-11-13 16:52     ` Ben Widawsky
2012-11-13 16:54     ` Chris Wilson
2012-11-19 10:55   ` Mika Kuoppala
2012-11-19 17:21     ` Ben Widawsky
2012-11-29  8:43       ` Mika Kuoppala

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=1352814696-2154-1-git-send-email-mika.kuoppala@intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --cc=intel-gfx@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox