---

yaml --- r: 345645 b: refs/heads/master c: 7b01e26 h: refs/heads/master i: 345643: 5f670f2 v: v3
git-mirror · Nov 29, 2012 · 0cb1c91 · 0cb1c91
1 parent 008481e
commit 0cb1c91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df2b23d97919601218e9229ff517afea83fe5520
+refs/heads/master: 7b01e260a6cad9152eefb44ce64f3a2073af1e6b
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2397,7 +2397,11 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj,
 
 	ret = to->sync_to(to, from, seqno);
 	if (!ret)
-		from->sync_seqno[idx] = seqno;
+		/* We use last_read_seqno because sync_to()
+		 * might have just caused seqno wrap under
+		 * the radar.
+		 */
+		from->sync_seqno[idx] = obj->last_read_seqno;
 
 	return ret;
 }