From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/gem: Cleanup shadow batch after I915_EXEC_SECURE
Date: Wed, 26 Feb 2020 13:12:39 +0000 [thread overview]
Message-ID: <2eedf86b-967e-c6e5-28ba-984ee1d7ace0@linux.intel.com> (raw)
In-Reply-To: <20200224155601.4125280-1-chris@chris-wilson.co.uk>
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@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@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-02-26 13:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 15:56 [Intel-gfx] [PATCH] drm/i915/gem: Cleanup shadow batch after I915_EXEC_SECURE Chris Wilson
2020-02-24 20:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-26 10:35 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-02-26 13:12 ` Tvrtko Ursulin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2eedf86b-967e-c6e5-28ba-984ee1d7ace0@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox