diff options
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/i915_gem_gtt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 0f3fa34377c6..50710e3f1caa 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -103,7 +103,7 @@ fake_dma_object(struct drm_i915_private *i915, u64 size) obj = i915_gem_object_alloc(i915); if (!obj) - return ERR_PTR(-ENOMEM); + goto err; drm_gem_private_object_init(&i915->drm, &obj->base, size); i915_gem_object_init(obj, &fake_ops); @@ -114,10 +114,15 @@ fake_dma_object(struct drm_i915_private *i915, u64 size) /* Preallocate the "backing storage" */ if (i915_gem_object_pin_pages(obj)) - return ERR_PTR(-ENOMEM); + goto err_obj; i915_gem_object_unpin_pages(obj); return obj; + +err_obj: + i915_gem_object_put(obj); +err: + return ERR_PTR(-ENOMEM); } static int igt_ppgtt_alloc(void *arg) @@ -534,7 +539,7 @@ static int walk_hole(struct drm_i915_private *i915, vma = i915_vma_instance(obj, vm, NULL); if (IS_ERR(vma)) { err = PTR_ERR(vma); - goto err; + goto err_put; } for (addr = hole_start; @@ -545,7 +550,7 @@ static int walk_hole(struct drm_i915_private *i915, pr_err("%s bind failed at %llx + %llx [hole %llx- %llx] with err=%d\n", __func__, addr, vma->size, hole_start, hole_end, err); - goto err; + goto err_close; } i915_vma_unpin(vma); @@ -554,14 +559,14 @@ static int walk_hole(struct drm_i915_private *i915, pr_err("%s incorrect at %llx + %llx\n", __func__, addr, vma->size); err = -EINVAL; - goto err; + goto err_close; } err = i915_vma_unbind(vma); if (err) { pr_err("%s unbind failed at %llx + %llx with err=%d\n", __func__, addr, vma->size, err); - goto err; + goto err_close; } GEM_BUG_ON(drm_mm_node_allocated(&vma->node)); @@ -570,13 +575,14 @@ static int walk_hole(struct drm_i915_private *i915, "%s timed out at %llx\n", __func__, addr)) { err = -EINTR; - goto err; + goto err_close; } } -err: +err_close: if (!i915_vma_is_ggtt(vma)) i915_vma_close(vma); +err_put: i915_gem_object_put(obj); if (err) return err; |