From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 6/7] drm/i915: Only grab timestamps when needed
Date: Mon, 11 Jan 2016 14:08:40 +0000 [thread overview]
Message-ID: <1452521321-4032-7-git-send-email-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <1452521321-4032-1-git-send-email-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
No need to call ktime_get_raw_ns twice per unlimited wait and can
also elimate a local variable.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index de98dc41fb9f..c4f69579eb7a 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1246,7 +1246,7 @@ int __i915_wait_request(struct drm_i915_gem_request *req,
int state = interruptible ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;
DEFINE_WAIT(wait);
unsigned long timeout_expire;
- s64 before, now;
+ s64 before = 0;
int ret;
WARN(!intel_irqs_enabled(dev_priv), "IRQs disabled");
@@ -1266,14 +1266,17 @@ int __i915_wait_request(struct drm_i915_gem_request *req,
return -ETIME;
timeout_expire = jiffies + nsecs_to_jiffies_timeout(*timeout);
+
+ /*
+ * Record current time in case interrupted by signal, or wedged.
+ */
+ before = ktime_get_raw_ns();
}
if (INTEL_INFO(dev_priv)->gen >= 6)
gen6_rps_boost(dev_priv, rps, req->emitted_jiffies);
- /* Record current time in case interrupted by signal, or wedged */
trace_i915_gem_request_wait_begin(req);
- before = ktime_get_raw_ns();
/* Optimistic spin for the next jiffie before touching IRQs */
ret = __i915_spin_request(req, state);
@@ -1331,11 +1334,10 @@ int __i915_wait_request(struct drm_i915_gem_request *req,
finish_wait(&ring->irq_queue, &wait);
out:
- now = ktime_get_raw_ns();
trace_i915_gem_request_wait_end(req);
if (timeout) {
- s64 tres = *timeout - (now - before);
+ s64 tres = *timeout - (ktime_get_raw_ns() - before);
*timeout = tres < 0 ? 0 : tres;
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-01-11 14:08 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 14:08 [PATCH v3 0/7] Misc cleanups and locking fixes Tvrtko Ursulin
2016-01-11 14:08 ` [PATCH 1/7] drm/i915/bdw+: Replace list_del+list_add_tail with list_move_tail Tvrtko Ursulin
2016-01-11 14:08 ` [PATCH 2/7] drm/i915: Do not call API requiring struct_mutex where it is not available Tvrtko Ursulin
2016-01-11 14:35 ` Chris Wilson
2016-01-12 11:41 ` [PATCH v2 " Tvrtko Ursulin
2016-01-12 15:47 ` Dave Gordon
2016-01-13 16:16 ` [PATCH v3] " Tvrtko Ursulin
2016-01-13 19:34 ` Chris Wilson
2016-01-11 14:08 ` [PATCH 3/7] drm/i915: Cache ringbuffer GTT address Tvrtko Ursulin
2016-01-11 14:30 ` Chris Wilson
2016-01-11 14:31 ` Chris Wilson
2016-01-11 15:06 ` Tvrtko Ursulin
2016-01-11 14:08 ` [PATCH 4/7] drm/i915: Cache LRC state page in the context Tvrtko Ursulin
2016-01-11 14:29 ` Chris Wilson
2016-01-11 15:07 ` Tvrtko Ursulin
2016-01-12 11:43 ` [PATCH v2 " Tvrtko Ursulin
2016-01-12 11:56 ` [PATCH v3 " Tvrtko Ursulin
2016-01-12 12:12 ` Chris Wilson
2016-01-12 12:54 ` Tvrtko Ursulin
2016-01-12 13:11 ` Chris Wilson
2016-01-12 16:45 ` Dave Gordon
2016-01-13 1:37 ` Chris Wilson
2016-01-13 13:49 ` Tvrtko Ursulin
2016-01-11 14:08 ` [PATCH 5/7] drm/i915: Don't need a timer to wake us up Tvrtko Ursulin
2016-01-11 14:33 ` Chris Wilson
2016-01-12 10:20 ` Tvrtko Ursulin
2016-01-11 14:08 ` Tvrtko Ursulin [this message]
2016-01-11 14:36 ` [PATCH 6/7] drm/i915: Only grab timestamps when needed Chris Wilson
2016-01-11 15:04 ` Tvrtko Ursulin
2016-01-12 15:52 ` Dave Gordon
2016-01-12 17:14 ` Daniel Vetter
2016-01-13 13:54 ` [PATCH v2] " Tvrtko Ursulin
2016-01-11 14:08 ` [PATCH 7/7] drm/i915: GEM operations need to be done under the big lock Tvrtko Ursulin
2016-01-11 14:38 ` Chris Wilson
2016-01-11 14:47 ` Tvrtko Ursulin
2016-01-11 15:00 ` Chris Wilson
2016-01-11 15:04 ` Chris Wilson
2016-01-11 15:16 ` Tvrtko Ursulin
2016-01-11 15:36 ` Ville Syrjälä
2016-01-11 16:56 ` Chris Wilson
2016-01-13 12:46 ` Tvrtko Ursulin
2016-01-13 13:36 ` Imre Deak
2016-01-13 14:11 ` Tvrtko Ursulin
2016-01-13 14:32 ` Chris Wilson
2016-01-13 14:41 ` Imre Deak
2016-01-13 14:53 ` Tvrtko Ursulin
2016-01-13 15:25 ` Imre Deak
2016-01-13 15:55 ` Daniel Vetter
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=1452521321-4032-7-git-send-email-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@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;
as well as URLs for NNTP newsgroup(s).