Skip to content

Commit 2c59fd0

Browse files
committed
drm/i915/gem: Cleanup shadow batch after I915_EXEC_SECURE
Tidy up after a call to eb_parse() if a later bind fails. Closes: https://gitlab.freedesktop.org/drm/intel/issues/1312 Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Matthew Auld <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 12b3788 commit 2c59fd0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
27132713
vma = i915_gem_object_ggtt_pin(eb.batch->obj, NULL, 0, 0, 0);
27142714
if (IS_ERR(vma)) {
27152715
err = PTR_ERR(vma);
2716-
goto err_vma;
2716+
goto err_parse;
27172717
}
27182718

27192719
eb.batch = vma;
@@ -2792,6 +2792,7 @@ i915_gem_do_execbuffer(struct drm_device *dev,
27922792
err_batch_unpin:
27932793
if (eb.batch_flags & I915_DISPATCH_SECURE)
27942794
i915_vma_unpin(eb.batch);
2795+
err_parse:
27952796
if (eb.batch->private)
27962797
intel_engine_pool_put(eb.batch->private);
27972798
err_vma:

0 commit comments

Comments
 (0)