Skip to content

Commit

Permalink
drm/i915: NOMEM->NOSPC
Browse files Browse the repository at this point in the history
To differentiate between encountering an out-of-memory error with running
out of space in the aperture, use ENOSPC for the later.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
  • Loading branch information
Chris Wilson authored and Eric Anholt committed Jun 9, 2009
1 parent 21d509e commit 2939e1f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@ i915_gem_evict_something(struct drm_device *dev)
/* If we didn't do any of the above, there's nothing to be done
* and we just can't fit it in.
*/
return -ENOMEM;
return -ENOSPC;
}
return ret;
}
Expand All @@ -2020,7 +2020,7 @@ i915_gem_evict_everything(struct drm_device *dev)
if (ret != 0)
break;
}
if (ret == -ENOMEM)
if (ret == -ENOSPC)
return 0;
return ret;
}
Expand Down Expand Up @@ -2229,7 +2229,7 @@ i915_gem_object_get_fence_reg(struct drm_gem_object *obj, bool write)
loff_t offset;

if (avail == 0)
return -ENOMEM;
return -ENOSPC;

for (i = dev_priv->fence_reg_start;
i < dev_priv->num_fence_regs; i++) {
Expand Down Expand Up @@ -2378,7 +2378,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
spin_unlock(&dev_priv->mm.active_list_lock);
if (lists_empty) {
DRM_ERROR("GTT full, but LRU list empty\n");
return -ENOMEM;
return -ENOSPC;
}

ret = i915_gem_evict_something(dev);
Expand Down Expand Up @@ -3349,7 +3349,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
break;

/* error other than GTT full, or we've already tried again */
if (ret != -ENOMEM || pin_tries >= 1) {
if (ret != -ENOSPC || pin_tries >= 1) {
if (ret != -ERESTARTSYS)
DRM_ERROR("Failed to pin buffers %d\n", ret);
goto err;
Expand Down

0 comments on commit 2939e1f

Please sign in to comment.