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

Commit 808b24d6 authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915: Propagate error from unbinding an unfenceable object. 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent b118c1e3

drivers/gpu/drm/i915/i915_gem.c

+7 −3
Original line number Diff line number Diff line
@@ -3307,9 +3307,13 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, 
	             obj_priv->tiling_mode != I915_TILING_NONE;



	/* Check fence reg constraints and rebind if necessary */

	if (need_fence && !i915_gem_object_fence_offset_ok(obj,

	    obj_priv->tiling_mode))

		i915_gem_object_unbind(obj);

	if (need_fence &&

	    !i915_gem_object_fence_offset_ok(obj,

					     obj_priv->tiling_mode)) {

		ret = i915_gem_object_unbind(obj);

		if (ret)

			return ret;

	}



	/* Choose the GTT offset for our buffer and put it there. */

	ret = i915_gem_object_pin(obj, (uint32_t) entry->alignment);