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

Commit dcd79934 authored by Chris Wilson's avatar Chris Wilson Committed by Jani Nikula
Browse files

drm/i915: Unconditionally flush any chipset buffers before execbuf 

If userspace is asynchronously streaming into the batch or other
execobjects, we may not flush those writes along with a change in cache
domain (as there is no change). Therefore those writes may end up in
internal chipset buffers and not visible to the GPU upon execution. We
must issue a flush command or otherwise we encounter incoherency in the
batchbuffers and the GPU executing invalid commands (i.e. hanging) quite
regularly.

v2: Throw a paranoid wmb() into the general flush so that we remain
consistent with before.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90841


Fixes: 1816f923 ("drm/i915: Support creation of unbound wc user...")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Akash Goel <akash.goel@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Tested-by: default avatarMatti Hämäläinen <ccr@tnsp.org>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160818161718.27187-1-chris@chris-wilson.co.uk


(cherry picked from commit 600f4368)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c7aca235

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -3591,6 +3591,7 @@ int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle); 
/* belongs in i915_gem_gtt.h */

/* belongs in i915_gem_gtt.h */

static inline void i915_gem_chipset_flush(struct drm_i915_private *dev_priv)

static inline void i915_gem_chipset_flush(struct drm_i915_private *dev_priv)

{

{

	wmb();

	if (INTEL_GEN(dev_priv) < 6)

	if (INTEL_GEN(dev_priv) < 6)

		intel_gtt_chipset_flush();

		intel_gtt_chipset_flush();

}

}

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+3 −10
Original line number Original line Diff line number Diff line
@@ -943,8 +943,6 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, 
{

{

	const unsigned other_rings = ~intel_engine_flag(req->engine);

	const unsigned other_rings = ~intel_engine_flag(req->engine);

	struct i915_vma *vma;

	struct i915_vma *vma;

	uint32_t flush_domains = 0;

	bool flush_chipset = false;

	int ret;

	int ret;





	list_for_each_entry(vma, vmas, exec_list) {

	list_for_each_entry(vma, vmas, exec_list) {
@@ -957,17 +955,12 @@ i915_gem_execbuffer_move_to_gpu(struct drm_i915_gem_request *req, 
		}

		}





		if (obj->base.write_domain & I915_GEM_DOMAIN_CPU)

		if (obj->base.write_domain & I915_GEM_DOMAIN_CPU)

			flush_chipset |= i915_gem_clflush_object(obj, false);

			i915_gem_clflush_object(obj, false);



		flush_domains |= obj->base.write_domain;

	}

	}





	if (flush_chipset)

	/* Unconditionally flush any chipset caches (for streaming writes). */

	i915_gem_chipset_flush(req->engine->i915);

	i915_gem_chipset_flush(req->engine->i915);





	if (flush_domains & I915_GEM_DOMAIN_GTT)

		wmb();



	/* Unconditionally invalidate gpu caches and ensure that we do flush

	/* Unconditionally invalidate gpu caches and ensure that we do flush

	 * any residual writes from the previous batch.

	 * any residual writes from the previous batch.

	 */

	 */