diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-01-29 16:49:05 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-02-15 10:48:08 +0100 |
| commit | e26e1b976dd4c537129e95eff10fec4e07da6dfa (patch) | |
| tree | 5c5593a189035ffe0dd81171cfaaa0724833c080 /drivers/gpu/drm | |
| parent | 59bbf84d8958a6e6cf579c8ddcca88e3f3924dbd (diff) | |
| download | op-kernel-dev-e26e1b976dd4c537129e95eff10fec4e07da6dfa.zip op-kernel-dev-e26e1b976dd4c537129e95eff10fec4e07da6dfa.tar.gz | |
drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
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>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1454086145-16160-3-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 133321a..45ce45a 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, |
