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

Commit 909d074c authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Double check activity before relocations 



If the object is active and we need to perform a relocation upon it, we
need to take the slow relocation path. Before we do, double check the
active requests to see if they have completed.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-22-git-send-email-chris@chris-wilson.co.uk
parent 776f3236

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+15 −1
Original line number Diff line number Diff line
@@ -441,6 +441,20 @@ relocate_entry_clflush(struct drm_i915_gem_object *obj, 
	return 0;

}



static bool object_is_idle(struct drm_i915_gem_object *obj)

{

	unsigned long active = obj->active;

	int idx;



	for_each_active(active, idx) {

		if (!i915_gem_active_is_idle(&obj->last_read[idx],

					     &obj->base.dev->struct_mutex))

			return false;

	}



	return true;

}



static int

i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,

				   struct eb_vmas *eb,
@@ -524,7 +538,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, 
	}



	/* We can't wait for rendering with pagefaults disabled */

	if (obj->active && pagefault_disabled())

	if (pagefault_disabled() && !object_is_idle(obj))

		return -EFAULT;



	if (use_cpu_reloc(obj))