From 424ab456e092f69de40fbb054bc11fae31ea6ead Mon Sep 17 00:00:00 2001
From: Imre Deak <imre.deak@intel.com>
Date: Tue, 21 May 2013 20:03:19 +0300
Subject: [PATCH] --- yaml --- r: 376383 b: refs/heads/master c:
 e054cc3937a4a58e77870d4c922a7b21824b610a h: refs/heads/master i:   376381:
 73596c0456a0ce91f9eff7603f50fd7e5b01632f   376379:
 232df6db3cea43dfcf1483aa1be06063b68f656e   376375:
 c9cee5b9881cd5533815925cb3d6bce4fe3b44d3   376367:
 6c537e621ae19fb5f073b36ec3f128e9ab819e47   376351:
 b3a167c0e5038486a9615f0fdad3fab2d88570dc   376319:
 68e064d56c20a649612d1459b308afc71ef9c7ac v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 06d0457caad2..13e82b86b04d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2554fc1fa6dc184ca553f73e3796fa59745efa8a
+refs/heads/master: e054cc3937a4a58e77870d4c922a7b21824b610a
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 6165535d15f0..a6cf8e843973 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1003,7 +1003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
 		wait_forever = false;
 	}
 
-	timeout_jiffies = timespec_to_jiffies(&wait_time);
+	timeout_jiffies = timespec_to_jiffies_timeout(&wait_time);
 
 	if (WARN_ON(!ring->irq_get(ring)))
 		return -ENODEV;