Skip to content

Commit

Permalink
drm/i915: i915_pages_create_for_stolen should return err ptr
Browse files Browse the repository at this point in the history
When gathering the pages from our backing storage we expect get_pages()
to either give us our sg_table or an err ptr. However when gathering our
fake pages for stolen memory we may return NULL in the event of a
failure. To prevent any funny business we should therefore return the
proper err ptr value.

Fixes: 03ac84f ("drm/i915: Pass around sg_table to get_pages/put_pages backend")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479488536-6168-1-git-send-email-matthew.auld@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Matthew Auld authored and Chris Wilson committed Nov 18, 2016
1 parent 50637aa commit 43e157f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/i915_gem_stolen.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,11 +525,11 @@ i915_pages_create_for_stolen(struct drm_device *dev,

st = kmalloc(sizeof(*st), GFP_KERNEL);
if (st == NULL)
return NULL;
return ERR_PTR(-ENOMEM);

if (sg_alloc_table(st, 1, GFP_KERNEL)) {
kfree(st);
return NULL;
return ERR_PTR(-ENOMEM);
}

sg = st->sgl;
Expand Down

0 comments on commit 43e157f

Please sign in to comment.