Commit 2c59fd06 authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200225082233.274530-4-chris@chris-wilson.co.uk
parent 12b37880

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

+2 −1
Original line number Diff line number Diff line
@@ -2713,7 +2713,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 
		vma = i915_gem_object_ggtt_pin(eb.batch->obj, NULL, 0, 0, 0);

		if (IS_ERR(vma)) {

			err = PTR_ERR(vma);

			goto err_vma;

			goto err_parse;

		}



		eb.batch = vma;
@@ -2792,6 +2792,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 
err_batch_unpin:

	if (eb.batch_flags & I915_DISPATCH_SECURE)

		i915_vma_unpin(eb.batch);

err_parse:

	if (eb.batch->private)

		intel_engine_pool_put(eb.batch->private);

err_vma: