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

Commit 37508589 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Reduce WARN(i915_gem_valid_gtt_space) to a debug-only check 



i915_gem_valid_gtt_space() is used after inserting the VMA to double
check the list - the location should have been chosen to pass all the
restrictions.

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/1470324762-2545-8-git-send-email-chris@chris-wilson.co.uk
parent 91b2db6f

drivers/gpu/drm/i915/i915_gem.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -3090,10 +3090,7 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj, 
			goto err_vma;

			goto err_vma;

		}

		}

	}

	}

	if (WARN_ON(!i915_gem_valid_gtt_space(vma, obj->cache_level))) {

	GEM_BUG_ON(!i915_gem_valid_gtt_space(vma, obj->cache_level));

		ret = -EINVAL;

		goto err_remove_node;

	}





	trace_i915_vma_bind(vma, flags);

	trace_i915_vma_bind(vma, flags);

	ret = i915_vma_bind(vma, obj->cache_level, flags);

	ret = i915_vma_bind(vma, obj->cache_level, flags);