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 <ch...@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

Reply via email to