浏览代码

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 <daniel.vetter@ffwll.ch>
Signed-off-by: Eric Anholt <eric@anholt.net>
Daniel Vetter 15 年之前
父节点
当前提交
4a7266123f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/gpu/drm/i915/i915_gem.c

+ 1 - 1
drivers/gpu/drm/i915/i915_gem.c

@@ -2552,12 +2552,12 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj)
 		int ret;
 		int ret;
 
 
 		i915_gem_object_flush_gpu_write_domain(obj);
 		i915_gem_object_flush_gpu_write_domain(obj);
-		i915_gem_object_flush_gtt_write_domain(obj);
 		ret = i915_gem_object_wait_rendering(obj);
 		ret = i915_gem_object_wait_rendering(obj);
 		if (ret != 0)
 		if (ret != 0)
 			return ret;
 			return ret;
 	}
 	}
 
 
+	i915_gem_object_flush_gtt_write_domain(obj);
 	i915_gem_clear_fence_reg (obj);
 	i915_gem_clear_fence_reg (obj);
 
 
 	return 0;
 	return 0;