public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	DRI Development <dri-devel@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: __i915_spin_request() sucks
Date: Fri, 13 Nov 2015 08:36:29 -0700	[thread overview]
Message-ID: <20151113153629.GB8939@kernel.dk> (raw)
In-Reply-To: <20151113091558.GN6247@nuc-i3427.alporthouse.com>

Previous patch was obvious pre-coffee crap, this should work for using
ktime to spin max 1usec.

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 5cf4a1998273..21192e55c33c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1148,17 +1148,18 @@ static bool missed_irq(struct drm_i915_private *dev_priv,
 
 static int __i915_spin_request(struct drm_i915_gem_request *req)
 {
-	unsigned long timeout;
+	ktime_t timeout;
 
 	if (i915_gem_request_get_ring(req)->irq_refcount)
 		return -EBUSY;
 
-	timeout = jiffies + 1;
+	timeout = ktime_get();
+	ktime_add_us(timeout, 1);
 	while (!need_resched()) {
 		if (i915_gem_request_completed(req, true))
 			return 0;
 
-		if (time_after_eq(jiffies, timeout))
+		if (ktime_after(ktime_get(), timeout))
 			break;
 
 		cpu_relax_lowlatency();

-- 
Jens Axboe


  parent reply	other threads:[~2015-11-13 15:36 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-12 20:36 __i915_spin_request() sucks Jens Axboe
2015-11-12 20:40 ` Jens Axboe
2015-11-12 22:19   ` Chris Wilson
2015-11-12 22:52     ` Jens Axboe
2015-11-12 22:59       ` Jens Axboe
2015-11-13  9:15       ` Chris Wilson
2015-11-13 15:12         ` Jens Axboe
2015-11-13 15:36         ` Jens Axboe [this message]
2015-11-13 16:13           ` Mike Galbraith
2015-11-13 16:22             ` Jens Axboe
2015-11-13 22:12               ` Chris Wilson
2015-11-13 22:16                 ` Jens Axboe

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=20151113153629.GB8939@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.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