leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: NOMEM->NOSPC

Browse Source 
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>
This commit is contained in:
Chris Wilson 2009-06-06 09:46:03 +01:00 committed by Eric Anholt
parent 21d509e339
commit 2939e1f533
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_gem.c
View File

@ -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 /* If we didn't do any of the above, there's nothing to be done
* and we just can't fit it in. * and we just can't fit it in.
*/ */
return -ENOMEM; return -ENOSPC;
} }
return ret; return ret;
} }
@ -2020,7 +2020,7 @@ i915_gem_evict_everything(struct drm_device *dev)
if (ret != 0) if (ret != 0)
break; break;
} }
if (ret == -ENOMEM) if (ret == -ENOSPC)
return 0; return 0;
return ret; return ret;
} }
@ -2229,7 +2229,7 @@ try_again:
loff_t offset; loff_t offset;
if (avail == 0) if (avail == 0)
return -ENOMEM; return -ENOSPC;
for (i = dev_priv->fence_reg_start; for (i = dev_priv->fence_reg_start;
i < dev_priv->num_fence_regs; i++) { i < dev_priv->num_fence_regs; i++) {
@ -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); spin_unlock(&dev_priv->mm.active_list_lock);
if (lists_empty) { if (lists_empty) {
DRM_ERROR("GTT full, but LRU list empty\n"); DRM_ERROR("GTT full, but LRU list empty\n");
return -ENOMEM; return -ENOSPC;
} }
ret = i915_gem_evict_something(dev); ret = i915_gem_evict_something(dev);
@ -3349,7 +3349,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
break; break;
/* error other than GTT full, or we've already tried again */ /* 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) if (ret != -ERESTARTSYS)
DRM_ERROR("Failed to pin buffers %d\n", ret); DRM_ERROR("Failed to pin buffers %d\n", ret);
goto err; goto err;