diff options
author | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:44:11 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:44:19 +1000 |
commit | 0b5e8db639de032bd4febbb0a5b1cd2c19bac26d (patch) | |
tree | eddc436f8cbf85cea5205f7dc118bf0068c2d127 /drivers/gpu/drm/i915/i915_gem.c | |
parent | 7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c (diff) | |
parent | 4f8d619cc3ab805aa1726c1dfe196a0705b955bd (diff) |
Merge remote branch 'anholt/drm-intel-next' into drm-linus
Pull more Intel changes in, especially one to init the GTT properly
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5b46623d62d..917b8377ae2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1288,6 +1288,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj) list->hash.key = list->file_offset_node->start; if (drm_ht_insert_item(&mm->offset_hash, &list->hash)) { DRM_ERROR("failed to add to map hash\n"); + ret = -ENOMEM; goto out_free_mm; } |