From: Dave Gordon <david.s.gordon@intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
Date: Mon, 25 Jan 2016 18:25:33 +0000 [thread overview]
Message-ID: <56A6689D.3070507@intel.com> (raw)
In-Reply-To: <1453571673-29911-1-git-send-email-chris@chris-wilson.co.uk>
On 23/01/16 17:54, Chris Wilson wrote:
> intel_rcs_ctx_init() can be interrupted by a signal (if it has to wait
> upon a full ring to advance). Don't emit an error for this.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index b09abd754349..fb6bf4e2d3a1 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -730,9 +730,9 @@ static int intel_rcs_ctx_init(struct drm_i915_gem_request *req)
>
> ret = i915_gem_render_state_init(req);
> if (ret)
> - DRM_ERROR("init render state: %d\n", ret);
> + return ret;
>
> - return ret;
> + return 0;
> }
>
> static int wa_add(struct drm_i915_private *dev_priv,
>
If you're not going to test the error code locally, you can just do:
return i915_gem_render_state_init(req);
.Dave.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-01-25 18:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 17:54 [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption Chris Wilson
2016-01-24 7:13 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-01-25 18:25 ` Dave Gordon [this message]
2016-01-25 21:24 ` [PATCH] " Chris Wilson
2016-01-28 12:54 ` ✗ Fi.CI.BAT: failure for " Patchwork
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=56A6689D.3070507@intel.com \
--to=david.s.gordon@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