---

yaml --- r: 298999 b: refs/heads/master c: 15a13bb h: refs/heads/master i: 298997: f9a5999 298995: 234348b 298991: 1356346 v: v3
git-mirror · Apr 12, 2012 · 048eb1a · 048eb1a
1 parent 8c1b66c
commit 048eb1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f57f9c167af7cb3fd315e6a8ebe194a8aea0832a
+refs/heads/master: 15a13bbdffb0d6288a5dd04aee9736267da1335f
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1493,6 +1493,7 @@ i915_gem_object_move_off_active(struct drm_i915_gem_object *obj)
 {
 	list_del_init(&obj->ring_list);
 	obj->last_rendering_seqno = 0;
+	obj->last_fenced_seqno = 0;
 }
 
 static void
@@ -1521,6 +1522,7 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
 	BUG_ON(!list_empty(&obj->gpu_write_list));
 	BUG_ON(!obj->active);
 	obj->ring = NULL;
+	obj->last_fenced_ring = NULL;
 
 	i915_gem_object_move_off_active(obj);
 	obj->fenced_gpu_access = false;