From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 3/3] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
Date: Fri, 29 Jan 2016 16:49:05 +0000 [thread overview]
Message-ID: <1454086145-16160-3-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1454086145-16160-1-git-send-email-chris@chris-wilson.co.uk>
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.
Testcase: igt/gem_concurrent_blit
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 6f5b511bdb5d..b813bbc8e41c 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -746,9 +746,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,
--
2.7.0
_______________________________________________
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-29 16:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 16:49 [PATCH 1/3] drm/i915: Allow i915_gem_object_get_page() on userptr as well Chris Wilson
2016-01-29 16:49 ` [PATCH 2/3] drm/i915: Fix some invalid requests cancellations Chris Wilson
2016-02-11 13:01 ` [Intel-gfx] " Tvrtko Ursulin
2016-02-11 13:01 ` Tvrtko Ursulin
2016-02-15 9:47 ` [Intel-gfx] " Daniel Vetter
2016-02-15 9:47 ` Daniel Vetter
2016-02-19 12:29 ` [Intel-gfx] " Tvrtko Ursulin
2016-02-19 12:29 ` Tvrtko Ursulin
2016-01-29 16:49 ` Chris Wilson [this message]
2016-02-11 12:12 ` [PATCH 3/3] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption Tvrtko Ursulin
2016-02-15 9:48 ` Daniel Vetter
2016-02-01 7:55 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Allow i915_gem_object_get_page() on userptr as well Patchwork
2016-02-03 18:27 ` [PATCH 1/3] " Rodrigo Vivi
2016-02-03 19:45 ` Jani Nikula
2016-02-04 12:37 ` Jani Nikula
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=1454086145-16160-3-git-send-email-chris@chris-wilson.co.uk \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.