From f42d6558e3266355d66ff6cc2a8209f5a20208d2 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 19 Feb 2010 11:52:01 +0100 Subject: [PATCH] --- yaml --- r: 185625 b: refs/heads/master c: 922a2efc1b6ef48e2783f7efeb3a94e952c7ed14 h: refs/heads/master i: 185623: 0c8261b2b8c53a00a0d17fbba41688ebfdf73cdc v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 138dd1138301..41025b6289ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4df2faf4512c2e2ffa6793e055c73a4e7b8b5e36 +refs/heads/master: 922a2efc1b6ef48e2783f7efeb3a94e952c7ed14 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 2571d1f543ef..6fe54db8f33c 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -2748,7 +2748,6 @@ static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) { struct drm_device *dev = obj->dev; - uint32_t seqno; uint32_t old_write_domain; if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0) @@ -2757,9 +2756,8 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) /* Queue the GPU write cache flushing we need. */ old_write_domain = obj->write_domain; i915_gem_flush(dev, 0, obj->write_domain); - seqno = i915_add_request(dev, NULL, obj->write_domain); + (void) i915_add_request(dev, NULL, obj->write_domain); BUG_ON(obj->write_domain); - i915_gem_object_move_to_active(obj, seqno); trace_i915_gem_object_change_domain(obj, obj->read_domains,