Skip to contentSkip to conversation

drm/i915: Add missing NULL check before calling initial_watermarks

PATCH Superseded Imre Deak 4 participants 10 messages Feb 29, 2016 – Mar 1, 2016

Subsystems (2)
lore
Share & tools
lore

Imre Deak

author
#0 lore raw

PATCH 1/1 drm/i915: Add missing NULL check before calling initial_watermarks

Not all platforms set this callback, so NULL check it before calling it.

CC Matt Roper <[email protected]>
Fixes commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
---
 drivers/gpu/drm/i915/intel_display.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -2
index 79bf527..a60018c 100644
@@ -4957,7 +4957,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	 */
 	intel_crtc_load_lut(crtc);
 
-	dev_priv->display.initial_watermarks(intel_crtc->config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(intel_crtc->config);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
@@ -5056,7 +5057,8 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 	if (!intel_crtc->config->has_dsi_encoder)
 		intel_ddi_enable_transcoder_func(crtc);
 
-	dev_priv->display.initial_watermarks(pipe_config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(pipe_config);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 5 lines · Imre Deak

Not all platforms set this callback, so NULL check it before calling it.

CC Matt Roper <[email protected]>
Fixes commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")

Oh, looks like gen9 is using the HSW enable, so yeah, we want to add the test there. But we probably want an 'else' as well that calls intel_update_watermarks(crtc) until we've converted the SKL-style code over.

I'm not sure why this didn't raise any CI errors? Seems like something that should have been easily caught by the BAT tests...

Matt

Quoted 31 lines
---
 drivers/gpu/drm/i915/intel_display.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -2
index 79bf527..a60018c 100644
@@ -4957,7 +4957,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	 */
 	intel_crtc_load_lut(crtc);
 
-	dev_priv->display.initial_watermarks(intel_crtc->config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(intel_crtc->config);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
@@ -5056,7 +5057,8 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 	if (!intel_crtc->config->has_dsi_encoder)
 		intel_ddi_enable_transcoder_func(crtc);
 
-	dev_priv->display.initial_watermarks(pipe_config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(pipe_config);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
Signature · 1 line
2.5.0
Signature · 9 lines
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#2 lore raw

PATCH v2 1/1 drm/i915: Add missing NULL check before calling initial_watermarks

In reply to Imre Deak

Not all platforms set this callback, so NULL check it before calling it.

v2:
- Call intel_update_watermarks() on HSW+ where the callback is not set. (Matt)

CC Matt Roper <[email protected]>
Fixes commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
---
 drivers/gpu/drm/i915/intel_display.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -2
index 79bf527..d4b0ad0 100644
@@ -4957,7 +4957,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	 */
 	intel_crtc_load_lut(crtc);
 
-	dev_priv->display.initial_watermarks(intel_crtc->config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(intel_crtc->config);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
@@ -5056,7 +5057,10 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 	if (!intel_crtc->config->has_dsi_encoder)
 		intel_ddi_enable_transcoder_func(crtc);
 
-	dev_priv->display.initial_watermarks(pipe_config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(pipe_config);
+	else
+		intel_update_watermarks(crtc);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 1/1
#3 lore raw
Quoted 9 lines · Imre Deak

Not all platforms set this callback, so NULL check it before calling it.

v2:
- Call intel_update_watermarks() on HSW+ where the callback is not set. (Matt)

CC Matt Roper <[email protected]>
Fixes commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")

Technically the change in ironlake_crtc_enable() shouldn't be necessary since all platforms that use that do have atomic watermarks, but adding the check certainly doesn't hurt anything.

Matt

Quoted 33 lines
---
 drivers/gpu/drm/i915/intel_display.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -2
index 79bf527..d4b0ad0 100644
@@ -4957,7 +4957,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	 */
 	intel_crtc_load_lut(crtc);
 
-	dev_priv->display.initial_watermarks(intel_crtc->config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(intel_crtc->config);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
@@ -5056,7 +5057,10 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 	if (!intel_crtc->config->has_dsi_encoder)
 		intel_ddi_enable_transcoder_func(crtc);
 
-	dev_priv->display.initial_watermarks(pipe_config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(pipe_config);
+	else
+		intel_update_watermarks(crtc);
 	intel_enable_pipe(intel_crtc);
 
 	if (intel_crtc->config->has_pch_encoder)
Signature · 1 line
2.5.0
Signature · 9 lines
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#4 lore raw
Quoted 14 lines · Matt Roper
Quoted 8 lines · Imre Deak

Not all platforms set this callback, so NULL check it before calling it.

v2:
- Call intel_update_watermarks() on HSW+ where the callback is not set.
  (Matt)

Quoted 4 lines
CC Matt Roper <[email protected]>
Fixes commit ed4a6a7c ("drm/i915: Add two-stage ILK-style

watermark programming (v11)")

Quoted 7 lines

Technically the change in ironlake_crtc_enable() shouldn't be necessary
since all platforms that use that do have atomic watermarks, but adding
the check certainly doesn't hurt anything.

The callback is set only conditionally even on those platforms, depending on whether the WM readout succeeded, so I thought it's safer this way.

--Imre

Quoted 31 lines

Matt

Quoted 29 lines

---
 drivers/gpu/drm/i915/intel_display.c | 8 ++++++--

 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 79bf527..d4b0ad0 100644
@@ -4957,7 +4957,8 @@ static void ironlake_crtc_enable(struct
 drm_crtc *crtc)
  	 */
  	intel_crtc_load_lut(crtc);

drivers/gpu/drm/i915/intel_display.c +2 -1
-	dev_priv->display.initial_watermarks(intel_crtc->config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(intel_crtc-
Quoted 1 line

config);

  intel_enable_pipe(intel_crtc);

  if (intel_crtc->config->has_pch_encoder)

drivers/gpu/drm/i915/intel_display.c +0 -0
@@ -5056,7 +5057,10 @@ static void haswell_crtc_enable(struct
 drm_crtc *crtc)
  	if (!intel_crtc->config->has_dsi_encoder)
  		intel_ddi_enable_transcoder_func(crtc);

drivers/gpu/drm/i915/intel_display.c +2 -1
-	dev_priv->display.initial_watermarks(pipe_config);
+	if (dev_priv->display.initial_watermarks != NULL)
+		dev_priv->display.initial_watermarks(pipe_config);
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +2 -0
+	else
+		intel_update_watermarks(crtc);

  intel_enable_pipe(intel_crtc);

  if (intel_crtc->config->has_pch_encoder)

Signature · 1 line
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)

In reply to Imre Deak
== Series Details ==

== Series Details ==

Series: drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
URL : https://patchwork.freedesktop.org/series/3930/
State : failure

== Summary ==

Series 3930v2 drm/i915: Add missing NULL check before calling initial_watermarks
http://patchwork.freedesktop.org/api/1.0/series/3930/revisions/2/mbox/

Test kms_flip:

        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (hsw-gt2)
                dmesg-warn -> PASS       (hsw-brixbox)
                pass       -> DMESG-WARN (bdw-ultra)
        Subgroup basic-plain-flip:
                pass       -> DMESG-WARN (hsw-gt2)
Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> SKIP       (snb-x220t)
        Subgroup force-edid:
                pass       -> SKIP       (snb-x220t)
        Subgroup force-load-detect:
                fail       -> DMESG-FAIL (ivb-t430s)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                pass       -> DMESG-WARN (bsw-nuc-2)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                dmesg-warn -> PASS       (snb-dellxps)
                dmesg-warn -> PASS       (byt-nuc)
        Subgroup basic-rte:
                dmesg-warn -> PASS       (snb-x220t)
                pass       -> DMESG-WARN (byt-nuc) UNSTABLE
bdw-nuci7        total:166  pass:155  dwarn:0   dfail:0   fail:0   skip:11 
bdw-ultra        total:169  pass:154  dwarn:1   dfail:0   fail:0   skip:14 
bsw-nuc-2        total:169  pass:137  dwarn:1   dfail:0   fail:1   skip:30 
byt-nuc          total:169  pass:143  dwarn:1   dfail:0   fail:0   skip:25 
hsw-brixbox      total:169  pass:154  dwarn:0   dfail:0   fail:0   skip:15 
hsw-gt2          total:169  pass:156  dwarn:1   dfail:1   fail:1   skip:10 
ilk-hp8440p      total:169  pass:117  dwarn:1   dfail:0   fail:1   skip:50 
ivb-t430s        total:169  pass:153  dwarn:0   dfail:1   fail:0   skip:15 
snb-dellxps      total:169  pass:144  dwarn:1   dfail:0   fail:1   skip:23 
snb-x220t        total:169  pass:142  dwarn:1   dfail:0   fail:2   skip:24 

Results at /archive/results/CI_IGT_test/Patchwork_1497/

a1c053436ca45c5860f842e294ad29d6055bd43b drm-intel-nightly: 2016y-02m-29d-16h-58m-26s UTC integration manifest ad1be9242b45df74f512fb0fda89c608c337560d drm/i915: Add missing NULL check before calling initial_watermarks

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#6 lore raw

Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)

Quoted 14 lines · Patchwork

== Series Details ==

Series: drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
URL   : https://patchwork.freedesktop.org/series/3930/
State : failure

== Summary ==

Series 3930v2 drm/i915: Add missing NULL check before calling initial_watermarks
http://patchwork.freedesktop.org/api/1.0/series/3930/revisions/2/mbox
/

Quoted 5 lines

Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (hsw-gt2)

On HSW this patch shouldn't matter, but I haven't seen this problem earlier, so opened a bug for it:
https://bugs.freedesktop.org/show_bug.cgi?id=94347

Quoted 2 lines

                dmesg-warn -> PASS       (hsw-brixbox) pass       -> DMESG-WARN (bdw-ultra)

This is a hw-access-while-suspended failure on the watermark optimize path, not relevant to this change. I'm guessing it was introduced by the two stage WM support patch. A fix would be to take a wake reference around the WM programming, or avoid the programming in cases where everything is inactive. Adding Matt and Maarten.

Quoted 2 lines

        Subgroup basic-plain-flip:
                pass       -> DMESG-WARN (hsw-gt2)

Same as above.

Quoted 9 lines

Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> SKIP       (snb-x220t) Subgroup force-edid:
                pass       -> SKIP       (snb-x220t) Subgroup force-load-detect:
                fail       -> DMESG-FAIL (ivb-t430s) Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:

Quoted 8 lines

                pass       -> DMESG-WARN (bsw-nuc-2) Test pm_rpm:
        Subgroup basic-pci-d3-state:
                dmesg-warn -> PASS       (snb-dellxps) dmesg-warn -> PASS       (byt-nuc) Subgroup basic-rte:
                dmesg-warn -> PASS       (snb-x220t) pass       -> DMESG-WARN (byt-nuc) UNSTABLE

For all the above failures, the given platforms are not relevant to this change.

Quoted 31 lines

bdw-
nuci7        total:166  pass:155  dwarn:0   dfail:0   fail:0   skip:1 1
bdw-
ultra        total:169  pass:154  dwarn:1   dfail:0   fail:0   skip:1 4
bsw-nuc-
2        total:169  pass:137  dwarn:1   dfail:0   fail:1   skip:30 byt-
nuc          total:169  pass:143  dwarn:1   dfail:0   fail:0   skip:2 5
hsw-
brixbox      total:169  pass:154  dwarn:0   dfail:0   fail:0   skip:1 5
hsw-
gt2          total:169  pass:156  dwarn:1   dfail:1   fail:1   skip:1 0
ilk-
hp8440p      total:169  pass:117  dwarn:1   dfail:0   fail:1   skip:5 0
ivb-
t430s        total:169  pass:153  dwarn:0   dfail:1   fail:0   skip:1 5
snb-
dellxps      total:169  pass:144  dwarn:1   dfail:0   fail:1   skip:2 3
snb-
x220t        total:169  pass:142  dwarn:1   dfail:0   fail:2   skip:2 4

Quoted 7 lines

Results at /archive/results/CI_IGT_test/Patchwork_1497/

a1c053436ca45c5860f842e294ad29d6055bd43b drm-intel-nightly: 2016y- 02m-29d-16h-58m-26s UTC integration manifest ad1be9242b45df74f512fb0fda89c608c337560d drm/i915: Add missing NULL check before calling initial_watermarks

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#7 lore raw

Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)

Quoted 59 lines · Imre Deak
Quoted 15 lines · Patchwork

== Series Details ==

Series: drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
URL   : https://patchwork.freedesktop.org/series/3930/
State : failure

== Summary ==

Series 3930v2 drm/i915: Add missing NULL check before calling initial_watermarks
http://patchwork.freedesktop.org/api/1.0/series/3930/revisions/2/mb
ox
/

Quoted 5 lines

Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (hsw-gt2)

On HSW this patch shouldn't matter, but I haven't seen this problem earlier, so opened a bug for it:
https://bugs.freedesktop.org/show_bug.cgi?id=94347

Quoted 2 lines

                dmesg-warn -> PASS       (hsw-brixbox) pass       -> DMESG-WARN (bdw-ultra)

This is a hw-access-while-suspended failure on the watermark optimize path, not relevant to this change. I'm guessing it was introduced by the two stage WM support patch. A fix would be to take a wake reference
around the WM programming, or avoid the programming in cases where everything is inactive. Adding Matt and Maarten.

Quoted 2 lines

        Subgroup basic-plain-flip:
                pass       -> DMESG-WARN (hsw-gt2)

Same as above.

Quoted 9 lines

Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> SKIP       (snb-x220t) Subgroup force-edid:
                pass       -> SKIP       (snb-x220t) Subgroup force-load-detect:
                fail       -> DMESG-FAIL (ivb-t430s) Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:

Quoted 8 lines

                pass       -> DMESG-WARN (bsw-nuc-2) Test pm_rpm:
        Subgroup basic-pci-d3-state:
                dmesg-warn -> PASS       (snb-dellxps) dmesg-warn -> PASS       (byt-nuc) Subgroup basic-rte:
                dmesg-warn -> PASS       (snb-x220t) pass       -> DMESG-WARN (byt-nuc) UNSTABLE

Quoted 2 lines

For all the above failures, the given platforms are not relevant to this change.

I pushed the patch to -dinq, thanks for the review.

--Imre

Quoted 48 lines
Quoted 41 lines

bdw-
nuci7        total:166  pass:155  dwarn:0   dfail:0   fail:0   skip :1
1
bdw-
ultra        total:169  pass:154  dwarn:1   dfail:0   fail:0   skip :1
4
bsw-nuc-
2        total:169  pass:137  dwarn:1   dfail:0   fail:1   skip:30 byt-
nuc          total:169  pass:143  dwarn:1   dfail:0   fail:0   skip :2
5
hsw-
brixbox      total:169  pass:154  dwarn:0   dfail:0   fail:0   skip :1
5
hsw-
gt2          total:169  pass:156  dwarn:1   dfail:1   fail:1   skip :1
0
ilk-
hp8440p      total:169  pass:117  dwarn:1   dfail:0   fail:1   skip :5
0
ivb-
t430s        total:169  pass:153  dwarn:0   dfail:1   fail:0   skip :1
5
snb-
dellxps      total:169  pass:144  dwarn:1   dfail:0   fail:1   skip :2
3
snb-
x220t        total:169  pass:142  dwarn:1   dfail:0   fail:2   skip :2
4

Quoted 7 lines

Results at /archive/results/CI_IGT_test/Patchwork_1497/

a1c053436ca45c5860f842e294ad29d6055bd43b drm-intel-nightly: 2016y- 02m-29d-16h-58m-26s UTC integration manifest ad1be9242b45df74f512fb0fda89c608c337560d drm/i915: Add missing NULL check before calling initial_watermarks

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)

In reply to Imre Deak
Quoted 21 lines · Imre Deak
Quoted 14 lines · Patchwork

== Series Details ==

Series: drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
URL   : https://patchwork.freedesktop.org/series/3930/
State : failure

== Summary ==

Series 3930v2 drm/i915: Add missing NULL check before calling initial_watermarks
http://patchwork.freedesktop.org/api/1.0/series/3930/revisions/2/mbox
/

Quoted 5 lines

Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (hsw-gt2)

Quoted 3 lines

On HSW this patch shouldn't matter, but I haven't seen this problem earlier, so opened a bug for it:
https://bugs.freedesktop.org/show_bug.cgi?id=94347

Could be a duplicate of
https://bugs.freedesktop.org/show_bug.cgi?id=94294
but I was too lazy to see i the ts vs. seq has the same 1 frame difference. We should improve the asserts in the test to give us more easily digestible information.

Quoted 78 lines
Quoted 3 lines

                dmesg-warn -> PASS       (hsw-brixbox) pass       -> DMESG-WARN (bdw-ultra)

This is a hw-access-while-suspended failure on the watermark optimize path, not relevant to this change. I'm guessing it was introduced by the two stage WM support patch. A fix would be to take a wake reference around the WM programming, or avoid the programming in cases where everything is inactive. Adding Matt and Maarten.

Quoted 2 lines

        Subgroup basic-plain-flip:
                pass       -> DMESG-WARN (hsw-gt2)

Same as above.

Quoted 9 lines

Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> SKIP       (snb-x220t) Subgroup force-edid:
                pass       -> SKIP       (snb-x220t) Subgroup force-load-detect:
                fail       -> DMESG-FAIL (ivb-t430s) Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:

Quoted 8 lines

                pass       -> DMESG-WARN (bsw-nuc-2) Test pm_rpm:
        Subgroup basic-pci-d3-state:
                dmesg-warn -> PASS       (snb-dellxps) dmesg-warn -> PASS       (byt-nuc) Subgroup basic-rte:
                dmesg-warn -> PASS       (snb-x220t) pass       -> DMESG-WARN (byt-nuc) UNSTABLE

For all the above failures, the given platforms are not relevant to this change.

Quoted 31 lines

bdw-
nuci7        total:166  pass:155  dwarn:0   dfail:0   fail:0   skip:1 1
bdw-
ultra        total:169  pass:154  dwarn:1   dfail:0   fail:0   skip:1 4
bsw-nuc-
2        total:169  pass:137  dwarn:1   dfail:0   fail:1   skip:30 byt-
nuc          total:169  pass:143  dwarn:1   dfail:0   fail:0   skip:2 5
hsw-
brixbox      total:169  pass:154  dwarn:0   dfail:0   fail:0   skip:1 5
hsw-
gt2          total:169  pass:156  dwarn:1   dfail:1   fail:1   skip:1 0
ilk-
hp8440p      total:169  pass:117  dwarn:1   dfail:0   fail:1   skip:5 0
ivb-
t430s        total:169  pass:153  dwarn:0   dfail:1   fail:0   skip:1 5
snb-
dellxps      total:169  pass:144  dwarn:1   dfail:0   fail:1   skip:2 3
snb-
x220t        total:169  pass:142  dwarn:1   dfail:0   fail:2   skip:2 4

Quoted 7 lines

Results at /archive/results/CI_IGT_test/Patchwork_1497/

a1c053436ca45c5860f842e294ad29d6055bd43b drm-intel-nightly: 2016y- 02m-29d-16h-58m-26s UTC integration manifest ad1be9242b45df74f512fb0fda89c608c337560d drm/i915: Add missing NULL check before calling initial_watermarks

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#9 lore raw

Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)

Quoted 27 lines · Ville Syrjälä
Quoted 22 lines · Imre Deak
Quoted 15 lines · Patchwork

== Series Details ==

Series: drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
URL   : https://patchwork.freedesktop.org/series/3930/
State : failure

== Summary ==

Series 3930v2 drm/i915: Add missing NULL check before calling initial_watermarks
http://patchwork.freedesktop.org/api/1.0/series/3930/revisions/2/
mbox
/

Quoted 5 lines

Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> DMESG-WARN (ilk-hp8440p) UNSTABLE Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (hsw-gt2)

Quoted 3 lines

On HSW this patch shouldn't matter, but I haven't seen this problem earlier, so opened a bug for it:
https://bugs.freedesktop.org/show_bug.cgi?id=94347

Quoted 5 lines

Could be a duplicate of
https://bugs.freedesktop.org/show_bug.cgi?id=94294
but I was too lazy to see i the ts vs. seq has the same 1 frame difference. We should improve the asserts in the test to give us more easily digestible information.

Yep, looks like the same ~+16ms difference. I marked the bug as a duplicate.

--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx