From 048eb1adb3e03333631b6e2c3171735662aca879 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 12 Apr 2012 01:27:57 +0200 Subject: [PATCH] --- yaml --- r: 298999 b: refs/heads/master c: 15a13bbdffb0d6288a5dd04aee9736267da1335f h: refs/heads/master i: 298997: f9a5999a7b4f99ec3dc9eaaa18d13b152f077da3 298995: 234348bdb3c06955063f80be55706db2ccc0bf50 298991: 1356346d942dccdab46ab0a3d50f39af84b4ffad v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7a96ad92450a..4c905f6710a8 100644 --- 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 index 4c65c639f772..0e3c6acde955 100644 --- 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;