* [PATCH 1/2] drm/i915: Ignore previous watermarks on ILK if inherited
@ 2017-11-01 17:24 Maarten Lankhorst
2017-11-01 17:24 ` [(RESEND for CI) PATCH 2/2] drm/i915: Re-enable fastboot by default Maarten Lankhorst
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2017-11-01 17:24 UTC (permalink / raw)
To: intel-gfx
Fixes the following error when fastset is enabled, caught by CI:
[drm:ilk_validate_wm_level.part.8 [i915]] Sprite WM0 too large 56 (max 0)
[drm:ilk_validate_pipe_wm [i915]] LP0 watermark invalid
[drm:intel_crtc_atomic_check [i915]] No valid intermediate pipe watermarks are possible
Triggered on debugfs_test.read_all_entries, but could have been any igt
test depending on ordering.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a01ec068eba8..05dbeb430e21 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3380,6 +3380,7 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
*/
*a = newstate->wm.ilk.optimal;
if (!newstate->base.active || intel_state->skip_intermediate_wm ||
+ oldstate->base.mode.private_flags & I915_MODE_FLAG_INHERITED ||
drm_atomic_crtc_needs_modeset(&newstate->base))
return 0;
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [(RESEND for CI) PATCH 2/2] drm/i915: Re-enable fastboot by default
2017-11-01 17:24 [PATCH 1/2] drm/i915: Ignore previous watermarks on ILK if inherited Maarten Lankhorst
@ 2017-11-01 17:24 ` Maarten Lankhorst
2017-11-01 19:21 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Ignore previous watermarks on ILK if inherited Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2017-11-01 17:24 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Daniel Vetter
This fix was originally reverted because it left a chromebook pixel
black, and no immediate fix was available. This has been fixed in the
meantime.
Rather than trying to remove the parameter, set it to default to true
for now, so we can always back out if required.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Testcase: kms_panel_fitting
---
drivers/gpu/drm/i915/i915_params.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index e54e6a4bc6bd..396126aac932 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -57,7 +57,7 @@
param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \
param(bool, enable_cmd_parser, true) \
param(bool, enable_hangcheck, true) \
- param(bool, fastboot, false) \
+ param(bool, fastboot, true) \
param(bool, prefault_disable, false) \
param(bool, load_detect_test, false) \
param(bool, force_reset_modeset_test, false) \
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Ignore previous watermarks on ILK if inherited
2017-11-01 17:24 [PATCH 1/2] drm/i915: Ignore previous watermarks on ILK if inherited Maarten Lankhorst
2017-11-01 17:24 ` [(RESEND for CI) PATCH 2/2] drm/i915: Re-enable fastboot by default Maarten Lankhorst
@ 2017-11-01 19:21 ` Patchwork
2017-11-02 8:37 ` [(rebase) PATCH] " Maarten Lankhorst
2017-11-02 10:05 ` ✗ Fi.CI.BAT: failure for series starting with [(rebase)] drm/i915: Ignore previous watermarks on ILK if inherited (rev2) Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-11-01 19:21 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: Ignore previous watermarks on ILK if inherited
URL : https://patchwork.freedesktop.org/series/32995/
State : failure
== Summary ==
Series 32995 revision 1 was fully merged or fully failed: no git log
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [(rebase) PATCH] drm/i915: Ignore previous watermarks on ILK if inherited
2017-11-01 17:24 [PATCH 1/2] drm/i915: Ignore previous watermarks on ILK if inherited Maarten Lankhorst
2017-11-01 17:24 ` [(RESEND for CI) PATCH 2/2] drm/i915: Re-enable fastboot by default Maarten Lankhorst
2017-11-01 19:21 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Ignore previous watermarks on ILK if inherited Patchwork
@ 2017-11-02 8:37 ` Maarten Lankhorst
2017-11-02 10:05 ` ✗ Fi.CI.BAT: failure for series starting with [(rebase)] drm/i915: Ignore previous watermarks on ILK if inherited (rev2) Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2017-11-02 8:37 UTC (permalink / raw)
To: intel-gfx
Fixes the following error when fastset is enabled, caught by CI:
[drm:ilk_validate_wm_level.part.8 [i915]] Sprite WM0 too large 56 (max 0)
[drm:ilk_validate_pipe_wm [i915]] LP0 watermark invalid
[drm:intel_crtc_atomic_check [i915]] No valid intermediate pipe watermarks are possible
Triggered on debugfs_test.read_all_entries, but could have been any igt
test depending on ordering.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 79f2e3865921..266aa702aabc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3377,7 +3377,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,
* and after the vblank.
*/
*a = newstate->wm.ilk.optimal;
- if (!newstate->base.active || drm_atomic_crtc_needs_modeset(&newstate->base))
+ if (!newstate->base.active ||
+ drm_atomic_crtc_needs_modeset(&newstate->base) ||
+ oldstate->base.mode.private_flags & I915_MODE_FLAG_INHERITED)
return 0;
a->pipe_enabled |= b->pipe_enabled;
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [(rebase)] drm/i915: Ignore previous watermarks on ILK if inherited (rev2)
2017-11-01 17:24 [PATCH 1/2] drm/i915: Ignore previous watermarks on ILK if inherited Maarten Lankhorst
` (2 preceding siblings ...)
2017-11-02 8:37 ` [(rebase) PATCH] " Maarten Lankhorst
@ 2017-11-02 10:05 ` Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-11-02 10:05 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: intel-gfx
== Series Details ==
Series: series starting with [(rebase)] drm/i915: Ignore previous watermarks on ILK if inherited (rev2)
URL : https://patchwork.freedesktop.org/series/32995/
State : failure
== Summary ==
Series 32995v2 series starting with [(rebase)] drm/i915: Ignore previous watermarks on ILK if inherited
https://patchwork.freedesktop.org/api/1.0/series/32995/revisions/2/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Test debugfs_test:
Subgroup read_all_entries:
pass -> FAIL (fi-hsw-4770)
Test gem_exec_reloc:
Subgroup basic-cpu-active:
fail -> PASS (fi-gdg-551) fdo#102582 +1
Test kms_frontbuffer_tracking:
Subgroup basic:
dmesg-warn -> PASS (fi-bdw-5557u) fdo#102473
fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#102473 https://bugs.freedesktop.org/show_bug.cgi?id=102473
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:449s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:457s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:377s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:546s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:275s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:504s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:505s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:504s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:491s
fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:566s
fi-cnl-y total:217 pass:196 dwarn:0 dfail:0 fail:0 skip:20
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:426s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:595s
fi-glk-dsi total:289 pass:258 dwarn:0 dfail:0 fail:1 skip:30 time:491s
fi-hsw-4770 total:289 pass:261 dwarn:0 dfail:0 fail:1 skip:27 time:435s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:426s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:425s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:490s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s
fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:485s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:577s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:479s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:586s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:579s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:454s
fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:592s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:649s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:516s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:506s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:468s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:575s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:419s
dcf7d008f606b543fef53609a6e336097e6b5694 drm-tip: 2017y-11m-02d-08h-43m-13s UTC integration manifest
14f4e0d629ec drm/i915: Re-enable fastboot by default
5375e3bc437a drm/i915: Ignore previous watermarks on ILK if inherited
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6919/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-02 10:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-01 17:24 [PATCH 1/2] drm/i915: Ignore previous watermarks on ILK if inherited Maarten Lankhorst
2017-11-01 17:24 ` [(RESEND for CI) PATCH 2/2] drm/i915: Re-enable fastboot by default Maarten Lankhorst
2017-11-01 19:21 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Ignore previous watermarks on ILK if inherited Patchwork
2017-11-02 8:37 ` [(rebase) PATCH] " Maarten Lankhorst
2017-11-02 10:05 ` ✗ Fi.CI.BAT: failure for series starting with [(rebase)] drm/i915: Ignore previous watermarks on ILK if inherited (rev2) 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.