Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43e157fa authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

drm/i915: i915_pages_create_for_stolen should return err ptr 



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: 03ac84f1 ("drm/i915: Pass around sg_table to get_pages/put_pages backend")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479488536-6168-1-git-send-email-matthew.auld@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 50637aa7

drivers/gpu/drm/i915/i915_gem_stolen.c

+2 −2
Original line number Diff line number Diff line
@@ -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;