Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86d5bc37 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Remove explicit flush from i915_gem_object_flush_fence() 



As the flush is either performed explictly immediately after the
execbuffer dispatch, or before the serialisation of last_fenced_seqno we
can forgo the explict i915_gem_flush_ring().

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 69c2fc89

drivers/gpu/drm/i915/i915_gem.c

+2 −14
Original line number Diff line number Diff line
@@ -2473,21 +2473,8 @@ static void i915_gem_object_update_fence(struct drm_i915_gem_object *obj, 
static int

i915_gem_object_flush_fence(struct drm_i915_gem_object *obj)

{

	int ret;



	if (obj->fenced_gpu_access) {

		if (obj->base.write_domain & I915_GEM_GPU_DOMAINS) {

			ret = i915_gem_flush_ring(obj->ring,

						  0, obj->base.write_domain);

			if (ret)

				return ret;

		}



		obj->fenced_gpu_access = false;

	}



	if (obj->last_fenced_seqno) {

		ret = i915_wait_seqno(obj->ring, obj->last_fenced_seqno);

		int ret = i915_wait_seqno(obj->ring, obj->last_fenced_seqno);

		if (ret)

			return ret;
@@ -2500,6 +2487,7 @@ i915_gem_object_flush_fence(struct drm_i915_gem_object *obj) 
	if (obj->base.read_domains & I915_GEM_DOMAIN_GTT)

		mb();



	obj->fenced_gpu_access = false;

	return 0;

}