drm/i915: don't trash the gtt when running out of fences

With the fence accounting fixed up in the previous commit not finding
enough fences is a fatal error and userspace bug. Trashing the entire
gtt is not gonna turn up that missing fence, so don't to this by
returning another error thatn ENOSPC.

This has the added benefit that it's easier to distinguish fence
accounting errors from gtt space accounting issues.

TTM serves as precendence for the EDEADLK error code - it returns it
when the reservation code needs resources already blocked by the
current reservation.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2011-12-14 13:57:09 +01:00
Родитель 1690e1eb7a
Коммит 39965b3766
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -2566,7 +2566,7 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
reg = i915_find_fence_reg(dev, pipelined); reg = i915_find_fence_reg(dev, pipelined);
if (reg == NULL) if (reg == NULL)
return -ENOSPC; return -EDEADLK;
ret = i915_gem_object_flush_fence(obj, pipelined); ret = i915_gem_object_flush_fence(obj, pipelined);
if (ret) if (ret)