| Message ID | 1454086145-16160-3-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 29/01/16 16:49, 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. > > 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, > Or just "return i915_gem_render_state_init(req);", but that is way below the threshold. Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
On Thu, Feb 11, 2016 at 12:12:26PM +0000, Tvrtko Ursulin wrote: > > On 29/01/16 16:49, 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. > > > >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, > > > > Or just "return i915_gem_render_state_init(req);", but that is way below the > threshold. > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Queued for -next, thanks for the patch. -Daniel
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,
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(-)