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

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 133321a5b3d0799ce74bc7999370558c6bf5a353..45ce45a5e122046047b2fadc75f5f6f89f34c379 100644 (file)
--- 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,