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

Commit ade7daa1 authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

drm/i915: BUG_ON when ggtt_view is NULL 



Lets BUG_ON and don't bother with a WARN and returning an error, so we can
remove the need to pollute the code with error handling, after all it is
a programmer error to provide NULL view. Also while we're here remove
redundant NULL ggtt_view check.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458834860-7898-1-git-send-email-matthew.auld@intel.com
parent 9f54d4bd

drivers/gpu/drm/i915/i915_gem.c

+2 −7
Original line number Diff line number Diff line
@@ -4235,9 +4235,6 @@ i915_gem_object_do_pin(struct drm_i915_gem_object *obj, 
	vma = ggtt_view ? i915_gem_obj_to_ggtt_view(obj, ggtt_view) :

			  i915_gem_obj_to_vma(obj, vm);



	if (IS_ERR(vma))

		return PTR_ERR(vma);



	if (vma) {

		if (WARN_ON(vma->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT))

			return -EBUSY;
@@ -4300,8 +4297,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, 
			 uint32_t alignment,

			 uint64_t flags)

{

	if (WARN_ONCE(!view, "no view specified"))

		return -EINVAL;

	BUG_ON(!view);



	return i915_gem_object_do_pin(obj, i915_obj_to_ggtt(obj), view,

				      alignment, flags | PIN_GLOBAL);
@@ -4618,8 +4614,7 @@ struct i915_vma *i915_gem_obj_to_ggtt_view(struct drm_i915_gem_object *obj, 
	struct i915_address_space *ggtt = i915_obj_to_ggtt(obj);

	struct i915_vma *vma;



	if (WARN_ONCE(!view, "no view specified"))

		return ERR_PTR(-EINVAL);

	BUG_ON(!view);



	list_for_each_entry(vma, &obj->vma_list, obj_link)

		if (vma->vm == ggtt &&

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −9
Original line number Diff line number Diff line
@@ -3341,15 +3341,7 @@ i915_gem_obj_lookup_or_create_ggtt_vma(struct drm_i915_gem_object *obj, 
				       const struct i915_ggtt_view *view)

{

	struct i915_address_space *ggtt = i915_obj_to_ggtt(obj);

	struct i915_vma *vma;



	if (WARN_ON(!view))

		return ERR_PTR(-EINVAL);



	vma = i915_gem_obj_to_ggtt_view(obj, view);



	if (IS_ERR(vma))

		return vma;

	struct i915_vma *vma = i915_gem_obj_to_ggtt_view(obj, view);



	if (!vma)

		vma = __i915_gem_vma_create(obj, ggtt, view);