[Intel-gfx] [PATCH] drm/i915/gem: Cleanup shadow batch after I915_EXEC_SECURE

[Tvrtko Ursulin]

On 24/02/2020 15:56, Chris Wilson wrote:
> Tidy up after a call to eb_parse() if a later bind fails.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 87fa5f42c39a..4f9c1f5a4ded 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -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:
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko