All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Add some curly braces
@ 2016-08-05 17:41 ville.syrjala
  2016-08-05 17:49 ` Chris Wilson
  2016-08-06  7:41 ` ✗ Ro.CI.BAT: failure for " Patchwork
  0 siblings, 2 replies; 6+ messages in thread
From: ville.syrjala @ 2016-08-05 17:41 UTC (permalink / raw)
  To: intel-gfx

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

intel_enable_pipe() looks rather confusing when one side doesn't have
the curly braces, and the other one does. And what's even worse,
there's another if-else inside the braceless side. Let's put braces
around it to make it clear which branch goes where.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9cbf5431c1e3..ddae54ad4ac8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1959,12 +1959,12 @@ static void intel_enable_pipe(struct intel_crtc *crtc)
 	 * a plane.  On ILK+ the pipe PLLs are integrated, so we don't
 	 * need the check.
 	 */
-	if (HAS_GMCH_DISPLAY(dev_priv))
+	if (HAS_GMCH_DISPLAY(dev_priv)) {
 		if (intel_crtc_has_type(crtc->config, INTEL_OUTPUT_DSI))
 			assert_dsi_pll_enabled(dev_priv);
 		else
 			assert_pll_enabled(dev_priv, pipe);
-	else {
+	} else {
 		if (crtc->config->has_pch_encoder) {
 			/* if driving the PCH, we need FDI enabled */
 			assert_fdi_rx_pll_enabled(dev_priv, pch_transcoder);
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915: Add some curly braces
  2016-08-05 17:41 [PATCH] drm/i915: Add some curly braces ville.syrjala
@ 2016-08-05 17:49 ` Chris Wilson
  2016-08-05 17:52   ` Pandiyan, Dhinakaran
  2016-08-09 15:04   ` Ville Syrjälä
  2016-08-06  7:41 ` ✗ Ro.CI.BAT: failure for " Patchwork
  1 sibling, 2 replies; 6+ messages in thread
From: Chris Wilson @ 2016-08-05 17:49 UTC (permalink / raw)
  To: ville.syrjala; +Cc: intel-gfx

On Fri, Aug 05, 2016 at 08:41:34PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> intel_enable_pipe() looks rather confusing when one side doesn't have
> the curly braces, and the other one does. And what's even worse,
> there's another if-else inside the braceless side. Let's put braces
> around it to make it clear which branch goes where.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Easiest review of the day.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915: Add some curly braces
  2016-08-05 17:49 ` Chris Wilson
@ 2016-08-05 17:52   ` Pandiyan, Dhinakaran
  2016-08-09 15:04   ` Ville Syrjälä
  1 sibling, 0 replies; 6+ messages in thread
From: Pandiyan, Dhinakaran @ 2016-08-05 17:52 UTC (permalink / raw)
  To: chris; +Cc: intel-gfx

On Fri, 2016-08-05 at 18:49 +0100, Chris Wilson wrote:
> On Fri, Aug 05, 2016 at 08:41:34PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > intel_enable_pipe() looks rather confusing when one side doesn't have
> > the curly braces, and the other one does. And what's even worse,
> > there's another if-else inside the braceless side. Let's put braces
> > around it to make it clear which branch goes where.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Easiest review of the day.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
> 
I was just about getting started to do my first review!

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* ✗ Ro.CI.BAT: failure for drm/i915: Add some curly braces
  2016-08-05 17:41 [PATCH] drm/i915: Add some curly braces ville.syrjala
  2016-08-05 17:49 ` Chris Wilson
@ 2016-08-06  7:41 ` Patchwork
  2016-08-09 14:39   ` Ville Syrjälä
  1 sibling, 1 reply; 6+ messages in thread
From: Patchwork @ 2016-08-06  7:41 UTC (permalink / raw)
  To: ville.syrjala; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Add some curly braces
URL   : https://patchwork.freedesktop.org/series/10727/
State : failure

== Summary ==

Series 10727v1 drm/i915: Add some curly braces
http://patchwork.freedesktop.org/api/1.0/series/10727/revisions/1/mbox

Test kms_cursor_legacy:
        Subgroup basic-cursor-vs-flip-varying-size:
                pass       -> FAIL       (ro-ilk1-i5-650)
        Subgroup basic-flip-vs-cursor-legacy:
                pass       -> FAIL       (ro-skl3-i5-6260u)
                fail       -> PASS       (ro-bdw-i5-5250u)
        Subgroup basic-flip-vs-cursor-varying-size:
                fail       -> PASS       (ro-skl3-i5-6260u)

fi-kbl-qkkr      total:244  pass:185  dwarn:29  dfail:0   fail:3   skip:27 
ro-bdw-i5-5250u  total:240  pass:219  dwarn:4   dfail:0   fail:1   skip:16 
ro-bdw-i7-5557U  total:240  pass:224  dwarn:0   dfail:0   fail:0   skip:16 
ro-bdw-i7-5600u  total:240  pass:207  dwarn:0   dfail:0   fail:1   skip:32 
ro-bsw-n3050     total:240  pass:194  dwarn:0   dfail:0   fail:4   skip:42 
ro-byt-n2820     total:240  pass:197  dwarn:0   dfail:0   fail:3   skip:40 
ro-hsw-i3-4010u  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
ro-hsw-i7-4770r  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
ro-ilk-i7-620lm  total:240  pass:173  dwarn:1   dfail:0   fail:1   skip:65 
ro-ilk1-i5-650   total:235  pass:173  dwarn:0   dfail:0   fail:2   skip:60 
ro-ivb-i7-3770   total:240  pass:205  dwarn:0   dfail:0   fail:0   skip:35 
ro-ivb2-i7-3770  total:240  pass:209  dwarn:0   dfail:0   fail:0   skip:31 
ro-skl3-i5-6260u total:240  pass:223  dwarn:0   dfail:0   fail:3   skip:14 
ro-snb-i7-2620M  total:240  pass:198  dwarn:0   dfail:0   fail:1   skip:41 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1737/

b834992 drm-intel-nightly: 2016y-08m-05d-20h-40m-44s UTC integration manifest
ea86ad6 drm/i915: Add some curly braces

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: ✗ Ro.CI.BAT: failure for drm/i915: Add some curly braces
  2016-08-06  7:41 ` ✗ Ro.CI.BAT: failure for " Patchwork
@ 2016-08-09 14:39   ` Ville Syrjälä
  0 siblings, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2016-08-09 14:39 UTC (permalink / raw)
  To: intel-gfx

On Sat, Aug 06, 2016 at 07:41:20AM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Add some curly braces
> URL   : https://patchwork.freedesktop.org/series/10727/
> State : failure
> 
> == Summary ==
> 
> Series 10727v1 drm/i915: Add some curly braces
> http://patchwork.freedesktop.org/api/1.0/series/10727/revisions/1/mbox
> 
> Test kms_cursor_legacy:
>         Subgroup basic-cursor-vs-flip-varying-size:
>                 pass       -> FAIL       (ro-ilk1-i5-650)

(kms_cursor_legacy:8068) DEBUG: Test requirement passed: target > 1
(kms_cursor_legacy:8068) DEBUG: Using a target of 32 cursor updates per half-vblank
(kms_cursor_legacy:8068) WARNING: page flip 8 was delayed, missed 2 frames
(kms_cursor_legacy:8068) CRITICAL: Test assertion failure function basic_cursor_vs_flip, file kms_cursor_legacy.c:670:
(kms_cursor_legacy:8068) CRITICAL: Failed assertion: vbl.sequence == vblank_start + 60
(kms_cursor_legacy:8068) CRITICAL: error: 11705 != 11703

https://bugs.freedesktop.org/show_bug.cgi?id=96701

>         Subgroup basic-flip-vs-cursor-legacy:
>                 pass       -> FAIL       (ro-skl3-i5-6260u)


(kms_cursor_legacy:9238) DEBUG: Test requirement passed: target > 1
(kms_cursor_legacy:9238) DEBUG: Using a target of 64 cursor updates per half-vblank
(kms_cursor_legacy:9238) CRITICAL: Test assertion failure function basic_flip_vs_cursor, file kms_cursor_legacy.c:514:
(kms_cursor_legacy:9238) CRITICAL: Failed assertion: get_vblank(display->drm_fd, pipe, 0) == vblank_start
(kms_cursor_legacy:9238) CRITICAL: error: 11832 != 11831

https://bugs.freedesktop.org/show_bug.cgi?id=97188

>                 fail       -> PASS       (ro-bdw-i5-5250u)
>         Subgroup basic-flip-vs-cursor-varying-size:
>                 fail       -> PASS       (ro-skl3-i5-6260u)
> 
> fi-kbl-qkkr      total:244  pass:185  dwarn:29  dfail:0   fail:3   skip:27 
> ro-bdw-i5-5250u  total:240  pass:219  dwarn:4   dfail:0   fail:1   skip:16 
> ro-bdw-i7-5557U  total:240  pass:224  dwarn:0   dfail:0   fail:0   skip:16 
> ro-bdw-i7-5600u  total:240  pass:207  dwarn:0   dfail:0   fail:1   skip:32 
> ro-bsw-n3050     total:240  pass:194  dwarn:0   dfail:0   fail:4   skip:42 
> ro-byt-n2820     total:240  pass:197  dwarn:0   dfail:0   fail:3   skip:40 
> ro-hsw-i3-4010u  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
> ro-hsw-i7-4770r  total:240  pass:214  dwarn:0   dfail:0   fail:0   skip:26 
> ro-ilk-i7-620lm  total:240  pass:173  dwarn:1   dfail:0   fail:1   skip:65 
> ro-ilk1-i5-650   total:235  pass:173  dwarn:0   dfail:0   fail:2   skip:60 
> ro-ivb-i7-3770   total:240  pass:205  dwarn:0   dfail:0   fail:0   skip:35 
> ro-ivb2-i7-3770  total:240  pass:209  dwarn:0   dfail:0   fail:0   skip:31 
> ro-skl3-i5-6260u total:240  pass:223  dwarn:0   dfail:0   fail:3   skip:14 
> ro-snb-i7-2620M  total:240  pass:198  dwarn:0   dfail:0   fail:1   skip:41 
> 
> Results at /archive/results/CI_IGT_test/RO_Patchwork_1737/
> 
> b834992 drm-intel-nightly: 2016y-08m-05d-20h-40m-44s UTC integration manifest
> ea86ad6 drm/i915: Add some curly braces

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915: Add some curly braces
  2016-08-05 17:49 ` Chris Wilson
  2016-08-05 17:52   ` Pandiyan, Dhinakaran
@ 2016-08-09 15:04   ` Ville Syrjälä
  1 sibling, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2016-08-09 15:04 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx

On Fri, Aug 05, 2016 at 06:49:26PM +0100, Chris Wilson wrote:
> On Fri, Aug 05, 2016 at 08:41:34PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > intel_enable_pipe() looks rather confusing when one side doesn't have
> > the curly braces, and the other one does. And what's even worse,
> > there's another if-else inside the braceless side. Let's put braces
> > around it to make it clear which branch goes where.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Easiest review of the day.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Pushed to dinq. Thanks for the review.

> -Chris
> 
> -- 
> Chris Wilson, Intel Open Source Technology Centre

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-08-09 15:04 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-05 17:41 [PATCH] drm/i915: Add some curly braces ville.syrjala
2016-08-05 17:49 ` Chris Wilson
2016-08-05 17:52   ` Pandiyan, Dhinakaran
2016-08-09 15:04   ` Ville Syrjälä
2016-08-06  7:41 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-08-09 14:39   ` Ville Syrjälä

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.