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

Commit 4a025e26 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: clarify error paths in create_stolen_for_preallocated 



Use the standard inversely ordered goto label stack for everything.
Spotted while reviewing place where we might need to to call
vma_destroy but failed to do so.

Cc: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4e5aabfd

drivers/gpu/drm/i915/i915_gem_stolen.c

+3 −2
Original line number Diff line number Diff line
@@ -392,8 +392,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 
		ret = drm_mm_reserve_node(&ggtt->mm, &vma->node);

		if (ret) {

			DRM_DEBUG_KMS("failed to allocate stolen GTT space\n");

			i915_gem_vma_destroy(vma);

			goto err_out;

			goto err_vma;

		}

	}
@@ -404,6 +403,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, 


	return obj;



err_vma:

	i915_gem_vma_destroy(vma);

err_out:

	drm_mm_put_block(stolen);

	drm_gem_object_unreference(&obj->base);