All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
@ 2016-01-23 17:54 Chris Wilson
  2016-01-24  7:13 ` ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2016-01-23 17:54 UTC (permalink / raw)
  To: intel-gfx

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 <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 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,
-- 
2.7.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
  2016-01-23 17:54 [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption Chris Wilson
@ 2016-01-24  7:13 ` Patchwork
  2016-01-25 18:25 ` [PATCH] " Dave Gordon
  2016-01-28 12:54 ` ✗ Fi.CI.BAT: failure for " Patchwork
  2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2016-01-24  7:13 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Summary ==

Built on 8fe9e785ae04fa7c37f7935cff12d62e38054b60 drm-intel-nightly: 2016y-01m-21d-11h-02m-42s UTC integration manifest


bdw-nuci7        total:140  pass:131  dwarn:0   dfail:0   fail:0   skip:9  
bdw-ultra        total:143  pass:137  dwarn:0   dfail:0   fail:0   skip:6  
bsw-nuc-2        total:143  pass:119  dwarn:0   dfail:0   fail:0   skip:24 
byt-nuc          total:143  pass:128  dwarn:0   dfail:0   fail:0   skip:15 
hsw-brixbox      total:143  pass:136  dwarn:0   dfail:0   fail:0   skip:7  
hsw-gt2          total:143  pass:139  dwarn:0   dfail:0   fail:0   skip:4  
ilk-hp8440p      total:143  pass:104  dwarn:1   dfail:0   fail:0   skip:38 
ivb-t430s        total:143  pass:137  dwarn:0   dfail:0   fail:0   skip:6  
skl-i5k-2        total:143  pass:134  dwarn:1   dfail:0   fail:0   skip:8  
snb-dellxps      total:143  pass:129  dwarn:0   dfail:0   fail:0   skip:14 
snb-x220t        total:143  pass:129  dwarn:0   dfail:0   fail:1   skip:13 

Results at /archive/results/CI_IGT_test/Patchwork_1257/

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
  2016-01-23 17:54 [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption Chris Wilson
  2016-01-24  7:13 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2016-01-25 18:25 ` Dave Gordon
  2016-01-25 21:24   ` Chris Wilson
  2016-01-28 12:54 ` ✗ Fi.CI.BAT: failure for " Patchwork
  2 siblings, 1 reply; 5+ messages in thread
From: Dave Gordon @ 2016-01-25 18:25 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx

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 <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 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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
  2016-01-25 18:25 ` [PATCH] " Dave Gordon
@ 2016-01-25 21:24   ` Chris Wilson
  0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2016-01-25 21:24 UTC (permalink / raw)
  To: Dave Gordon; +Cc: intel-gfx

On Mon, Jan 25, 2016 at 06:25:33PM +0000, Dave Gordon wrote:
> 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 <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 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);

I can never decide which I prefer. If there is a a sequence, I continue
on using if(ret) return ret, since I prefer the consistent look. If I
just return blah(); and later come back and have to add another check, I
curse.

If it is a frequent path, then letting gcc see the tail call is
definitely worth it (if there is a chance for that tail call to
disappear!).
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption
  2016-01-23 17:54 [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption Chris Wilson
  2016-01-24  7:13 ` ✓ Fi.CI.BAT: success for " Patchwork
  2016-01-25 18:25 ` [PATCH] " Dave Gordon
@ 2016-01-28 12:54 ` Patchwork
  2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2016-01-28 12:54 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Summary ==

Built on b3f8ad64bc71f6236f05c2e9f4ad49a61745869a drm-intel-nightly: 2016y-01m-28d-10h-26m-23s UTC integration manifest


bdw-nuci7        total:156  pass:147  dwarn:0   dfail:0   fail:0   skip:9  
bdw-ultra        total:159  pass:153  dwarn:0   dfail:0   fail:0   skip:6  
bsw-nuc-2        total:159  pass:135  dwarn:0   dfail:0   fail:0   skip:24 
byt-nuc          total:159  pass:142  dwarn:0   dfail:0   fail:0   skip:17 
hsw-brixbox      total:159  pass:152  dwarn:0   dfail:0   fail:0   skip:7  
hsw-gt2          total:159  pass:155  dwarn:0   dfail:0   fail:0   skip:4  
ilk-hp8440p      total:159  pass:114  dwarn:0   dfail:0   fail:1   skip:44 
ivb-t430s        total:159  pass:151  dwarn:0   dfail:0   fail:0   skip:8  
snb-dellxps      total:159  pass:141  dwarn:0   dfail:0   fail:0   skip:18 
snb-x220t        total:159  pass:141  dwarn:0   dfail:0   fail:1   skip:17 

HANGED skl-i5k-2 in igt@gem_sync@basic-blt

Results at /archive/results/CI_IGT_test/Patchwork_1288/

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-28 12:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-23 17:54 [PATCH] drm/i915: Don't ERROR for an expected intel_rcs_ctx_init() interruption Chris Wilson
2016-01-24  7:13 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-01-25 18:25 ` [PATCH] " Dave Gordon
2016-01-25 21:24   ` Chris Wilson
2016-01-28 12:54 ` ✗ Fi.CI.BAT: failure for " Patchwork

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.