From: Daniel Vetter Date: Mon, 1 Feb 2010 12:59:16 +0000 (+0100) Subject: drm/i915: move a gtt flush to the correct place X-Git-Tag: v2.6.34-rc4~12^2~68^2~24^2~4 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=4a7266123fce399f695b62b7f87b467b317f1487;p=safe%2Fjmp%2Flinux-2.6 drm/i915: move a gtt flush to the correct place No functional change, because gtt flushing is a no-op. Still, try to keep the bookkeeping accurate. The if is still slightly wrong for with execbuf2 even i915-class hw doesn't always need a fence reg for gpu access. But that's for somewhen lateron. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4a14199..a236bfb 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2552,12 +2552,12 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj) int ret; i915_gem_object_flush_gpu_write_domain(obj); - i915_gem_object_flush_gtt_write_domain(obj); ret = i915_gem_object_wait_rendering(obj); if (ret != 0) return ret; } + i915_gem_object_flush_gtt_write_domain(obj); i915_gem_clear_fence_reg (obj); return 0;