* [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks
@ 2016-02-29 19:20 Imre Deak
2016-02-29 19:49 ` Matt Roper
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Imre Deak @ 2016-02-29 19:20 UTC (permalink / raw)
To: intel-gfx
Not all platforms set this callback, so NULL check it before calling it.
CC: Matt Roper <matthew.d.roper@intel.com>
Fixes: commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 79bf527..a60018c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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)
--
2.5.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks
2016-02-29 19:20 [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks Imre Deak
@ 2016-02-29 19:49 ` Matt Roper
2016-02-29 20:10 ` [PATCH v2] " Imre Deak
2016-03-01 7:24 ` ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2) Patchwork
2 siblings, 0 replies; 10+ messages in thread
From: Matt Roper @ 2016-02-29 19:49 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
On Mon, Feb 29, 2016 at 09:20:35PM +0200, Imre Deak wrote:
> Not all platforms set this callback, so NULL check it before calling it.
>
> CC: Matt Roper <matthew.d.roper@intel.com>
> Fixes: commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
> Signed-off-by: Imre Deak <imre.deak@intel.com>
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
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 79bf527..a60018c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -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)
> --
> 2.5.0
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] drm/i915: Add missing NULL check before calling initial_watermarks
2016-02-29 19:20 [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks Imre Deak
2016-02-29 19:49 ` Matt Roper
@ 2016-02-29 20:10 ` Imre Deak
2016-02-29 21:06 ` Matt Roper
2016-03-01 7:24 ` ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2) Patchwork
2 siblings, 1 reply; 10+ messages in thread
From: Imre Deak @ 2016-02-29 20:10 UTC (permalink / raw)
To: intel-gfx
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 <matthew.d.roper@intel.com>
Fixes: commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 79bf527..d4b0ad0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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)
--
2.5.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/i915: Add missing NULL check before calling initial_watermarks
2016-02-29 20:10 ` [PATCH v2] " Imre Deak
@ 2016-02-29 21:06 ` Matt Roper
2016-02-29 21:35 ` Imre Deak
0 siblings, 1 reply; 10+ messages in thread
From: Matt Roper @ 2016-02-29 21:06 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
On Mon, Feb 29, 2016 at 10:10:33PM +0200, Imre Deak wrote:
> 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 <matthew.d.roper@intel.com>
> Fixes: commit ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
> Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
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
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 79bf527..d4b0ad0 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -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)
> --
> 2.5.0
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/i915: Add missing NULL check before calling initial_watermarks
2016-02-29 21:06 ` Matt Roper
@ 2016-02-29 21:35 ` Imre Deak
0 siblings, 0 replies; 10+ messages in thread
From: Imre Deak @ 2016-02-29 21:35 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx
On Mon, 2016-02-29 at 13:06 -0800, Matt Roper wrote:
> On Mon, Feb 29, 2016 at 10:10:33PM +0200, Imre Deak wrote:
> > 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 <matthew.d.roper@intel.com>
> > Fixes: commit ed4a6a7c ("drm/i915: Add two-stage ILK-style
> > watermark programming (v11)")
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
>
> 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
> Matt
>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c
> > b/drivers/gpu/drm/i915/intel_display.c
> > index 79bf527..d4b0ad0 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -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)
> > --
> > 2.5.0
> >
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
2016-02-29 19:20 [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks Imre Deak
2016-02-29 19:49 ` Matt Roper
2016-02-29 20:10 ` [PATCH v2] " Imre Deak
@ 2016-03-01 7:24 ` Patchwork
2016-03-01 10:32 ` Imre Deak
2 siblings, 1 reply; 10+ messages in thread
From: Patchwork @ 2016-03-01 7:24 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
2016-03-01 7:24 ` ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2) Patchwork
@ 2016-03-01 10:32 ` Imre Deak
2016-03-01 10:42 ` Imre Deak
2016-03-01 10:45 ` Ville Syrjälä
0 siblings, 2 replies; 10+ messages in thread
From: Imre Deak @ 2016-03-01 10:32 UTC (permalink / raw)
To: intel-gfx
On Tue, 2016-03-01 at 07:24 +0000, Patchwork wrote:
> == 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)
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
> 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.
> Subgroup basic-plain-flip:
> pass -> DMESG-WARN (hsw-gt2)
Same as above.
> 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
For all the above failures, the given platforms are not relevant to
this change.
>
> 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
>
> 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
2016-03-01 10:32 ` Imre Deak
@ 2016-03-01 10:42 ` Imre Deak
2016-03-01 10:45 ` Ville Syrjälä
1 sibling, 0 replies; 10+ messages in thread
From: Imre Deak @ 2016-03-01 10:42 UTC (permalink / raw)
To: intel-gfx
On Tue, 2016-03-01 at 12:32 +0200, Imre Deak wrote:
> On Tue, 2016-03-01 at 07:24 +0000, Patchwork wrote:
> > == 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
> > /
> >
> > 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
>
> > 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.
>
> > Subgroup basic-plain-flip:
> > pass -> DMESG-WARN (hsw-gt2)
>
> Same as above.
>
> > 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
>
> 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
>
> >
> > 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
> >
> > 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
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
2016-03-01 10:32 ` Imre Deak
2016-03-01 10:42 ` Imre Deak
@ 2016-03-01 10:45 ` Ville Syrjälä
2016-03-01 11:30 ` Imre Deak
1 sibling, 1 reply; 10+ messages in thread
From: Ville Syrjälä @ 2016-03-01 10:45 UTC (permalink / raw)
To: Imre Deak; +Cc: intel-gfx
On Tue, Mar 01, 2016 at 12:32:53PM +0200, Imre Deak wrote:
> On Tue, 2016-03-01 at 07:24 +0000, Patchwork wrote:
> > == 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)
>
> 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.
>
> > 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.
>
> > Subgroup basic-plain-flip:
> > pass -> DMESG-WARN (hsw-gt2)
>
> Same as above.
>
> > 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
>
> For all the above failures, the given platforms are not relevant to
> this change.
>
> >
> > 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
> >
> > 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
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
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] 10+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2)
2016-03-01 10:45 ` Ville Syrjälä
@ 2016-03-01 11:30 ` Imre Deak
0 siblings, 0 replies; 10+ messages in thread
From: Imre Deak @ 2016-03-01 11:30 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On ti, 2016-03-01 at 12:45 +0200, Ville Syrjälä wrote:
> On Tue, Mar 01, 2016 at 12:32:53PM +0200, Imre Deak wrote:
> > On Tue, 2016-03-01 at 07:24 +0000, Patchwork wrote:
> > > == 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)
> >
> > 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.
Yep, looks like the same ~+16ms difference. I marked the bug as a
duplicate.
--Imre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-03-01 11:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-29 19:20 [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks Imre Deak
2016-02-29 19:49 ` Matt Roper
2016-02-29 20:10 ` [PATCH v2] " Imre Deak
2016-02-29 21:06 ` Matt Roper
2016-02-29 21:35 ` Imre Deak
2016-03-01 7:24 ` ✗ Fi.CI.BAT: failure for drm/i915: Add missing NULL check before calling initial_watermarks (rev2) Patchwork
2016-03-01 10:32 ` Imre Deak
2016-03-01 10:42 ` Imre Deak
2016-03-01 10:45 ` Ville Syrjälä
2016-03-01 11:30 ` Imre Deak
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.