Skip to contentSkip to conversation

drm/i915: Ignore previous watermarks on ILK if inherited

PATCH In review Maarten Lankhorst 3 participants 16 messages Nov 8, 2017 – Nov 9, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/i915: Ignore previous watermarks on ILK if inherited

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.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +3 -1
index 46440e2ecb33..9e8a0a9cac02 100644
@@ -3137,7 +3137,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;
Signature · 6 lines
2.15.0

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

PATCH 2/3 drm/i915: Enable FIFO underrun reporting after initial fastset

The firmware may have set up the pipe correctly, but the FIFO underrun and CRC interrupts are likely not enabled.

This resulted in debugfs_test.read_all_entries failing on haswell, because of a timeout when reading the crc debugfs entry.

Solve this by enabling FIFO underrun reporting after the initial fastset, which lets interrupts be generated as expected.

Testcase: debugfs_test.read_all_entries

---
 drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_display.c +10 -0
index 737de251d0f8..8d42e6a910d4 100644
@@ -12875,6 +12875,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 				     struct drm_crtc_state *old_crtc_state)
 {
+	struct drm_i915_private *dev_priv = to_i915(crtc->dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_atomic_state *old_intel_state =
 		to_intel_atomic_state(old_crtc_state->state);
@@ -12882,6 +12883,15 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 		intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
 
 	intel_pipe_update_end(new_crtc_state);
+
+	if (HAS_PCH_SPLIT(dev_priv) && new_crtc_state->update_pipe &&
+	    !needs_modeset(&new_crtc_state->base) &&
+	    old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED) {
+		intel_set_cpu_fifo_underrun_reporting(dev_priv, intel_crtc->pipe, true);
+
+		if (new_crtc_state->has_pch_encoder && !HAS_DDI(dev_priv))
+			intel_set_pch_fifo_underrun_reporting(dev_priv, intel_crtc->pipe, true);
+	}
 }
 
 /**
Signature · 6 lines
2.15.0

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

Re: [PATCH 2/3] drm/i915: Enable FIFO underrun reporting after initial fastset

Quoted 28 lines · Maarten Lankhorst

The firmware may have set up the pipe correctly, but the FIFO underrun and CRC interrupts are likely not enabled.

This resulted in debugfs_test.read_all_entries failing on haswell, because of a timeout when reading the crc debugfs entry.

Solve this by enabling FIFO underrun reporting after the initial fastset, which lets interrupts be generated as expected.

Testcase: debugfs_test.read_all_entries

---
 drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
index 737de251d0f8..8d42e6a910d4 100644
@@ -12875,6 +12875,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 				     struct drm_crtc_state *old_crtc_state)
 {
+	struct drm_i915_private *dev_priv = to_i915(crtc->dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_atomic_state *old_intel_state =
 		to_intel_atomic_state(old_crtc_state->state);

drivers/gpu/drm/i915/intel_display.c static void intel_finish_crtc_commit(struct drm_crtc *crtc, · line 12887

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -12882,6 +12883,15 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 		intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
 
 	intel_pipe_update_end(new_crtc_state);
+
+	if (HAS_PCH_SPLIT(dev_priv) && new_crtc_state->update_pipe &&

The HAS_PCH_SPLIT looks very wrong. Just enable fifo underrun reporting already for the relevant pipes. I think really the only check you need here is for I915_MODE_FLAG_INHERITED and then the has_pch_encoder check too. Everything else looks like cargo culting conditions.

Note that at driver boot-up _all_ fifo underrun reporting is disabled by default, so we really need to enable it everywhere explicitly.

Placement looks good since it's after the wm update. That's really the only reason we don't enable it straight at driver load, since we don't entirely trust the firmware wm settings.
-Daniel

Quoted 17 lines
drivers/gpu/drm/i915/intel_display.c +7 -0
+	    !needs_modeset(&new_crtc_state->base) &&
+	    old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED) {
+		intel_set_cpu_fifo_underrun_reporting(dev_priv, intel_crtc->pipe, true);
+
+		if (new_crtc_state->has_pch_encoder && !HAS_DDI(dev_priv))
+			intel_set_pch_fifo_underrun_reporting(dev_priv, intel_crtc->pipe, true);
+	}
 }
 
 /**
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [PATCH 2/3] drm/i915: Enable FIFO underrun reporting after initial fastset

Op 08-11-17 om 16:38 schreef Daniel Vetter:

Quoted 31 lines · Maarten Lankhorst
Quoted 30 lines

The firmware may have set up the pipe correctly, but the FIFO underrun and CRC interrupts are likely not enabled.

This resulted in debugfs_test.read_all_entries failing on haswell, because of a timeout when reading the crc debugfs entry.

Solve this by enabling FIFO underrun reporting after the initial fastset, which lets interrupts be generated as expected.

Testcase: debugfs_test.read_all_entries

---
 drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
index 737de251d0f8..8d42e6a910d4 100644
@@ -12875,6 +12875,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 				     struct drm_crtc_state *old_crtc_state)
 {
+	struct drm_i915_private *dev_priv = to_i915(crtc->dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_atomic_state *old_intel_state =
 		to_intel_atomic_state(old_crtc_state->state);
@@ -12882,6 +12883,15 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 		intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_display.c static void intel_finish_crtc_commit(struct drm_crtc *crtc, · line 12887

Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c +2 -0
 	intel_pipe_update_end(new_crtc_state);
+
+	if (HAS_PCH_SPLIT(dev_priv) && new_crtc_state->update_pipe &&

The HAS_PCH_SPLIT looks very wrong. Just enable fifo underrun reporting already for the relevant pipes. I think really the only check you need here is for I915_MODE_FLAG_INHERITED and then the has_pch_encoder check too. Everything else looks like cargo culting conditions.

Agree, I'll drop the HAS_PCH_SPLIT check part, has_pch_encoder && !HAS_DDI should be enough. :-)

Quoted 6 lines

Note that at driver boot-up _all_ fifo underrun reporting is disabled by default, so we really need to enable it everywhere explicitly.

Placement looks good since it's after the wm update. That's really the only reason we don't enable it straight at driver load, since we don't entirely trust the firmware wm settings.

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

#4 lore raw

Re: [PATCH 2/3] drm/i915: Enable FIFO underrun reporting after initial fastset

In reply to Daniel Vetter

Op 08-11-17 om 16:38 schreef Daniel Vetter:

Quoted 39 lines · Maarten Lankhorst
Quoted 28 lines

The firmware may have set up the pipe correctly, but the FIFO underrun and CRC interrupts are likely not enabled.

This resulted in debugfs_test.read_all_entries failing on haswell, because of a timeout when reading the crc debugfs entry.

Solve this by enabling FIFO underrun reporting after the initial fastset, which lets interrupts be generated as expected.

Testcase: debugfs_test.read_all_entries

---
 drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_display.c +1 -0
index 737de251d0f8..8d42e6a910d4 100644
@@ -12875,6 +12875,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 				     struct drm_crtc_state *old_crtc_state)
 {
+	struct drm_i915_private *dev_priv = to_i915(crtc->dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_atomic_state *old_intel_state =
 		to_intel_atomic_state(old_crtc_state->state);

drivers/gpu/drm/i915/intel_display.c static void intel_finish_crtc_commit(struct drm_crtc *crtc, · line 12887

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -12882,6 +12883,15 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc,
 		intel_atomic_get_new_crtc_state(old_intel_state, intel_crtc);
 
 	intel_pipe_update_end(new_crtc_state);
+
+	if (HAS_PCH_SPLIT(dev_priv) && new_crtc_state->update_pipe &&

The HAS_PCH_SPLIT looks very wrong. Just enable fifo underrun reporting already for the relevant pipes. I think really the only check you need here is for I915_MODE_FLAG_INHERITED and then the has_pch_encoder check too. Everything else looks like cargo culting conditions.

Quoted 7 lines

Note that at driver boot-up _all_ fifo underrun reporting is disabled by default, so we really need to enable it everywhere explicitly.

Placement looks good since it's after the wm update. That's really the only reason we don't enable it straight at driver load, since we don't entirely trust the firmware wm settings.
-Daniel

Ack, only reason I had it was for has_pch_encoder, but makes sense to enable it on all platforms. :)

Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +7 -0
+	    !needs_modeset(&new_crtc_state->base) &&
+	    old_crtc_state->mode.private_flags & I915_MODE_FLAG_INHERITED) {
+		intel_set_cpu_fifo_underrun_reporting(dev_priv, intel_crtc->pipe, true);
+
+		if (new_crtc_state->has_pch_encoder && !HAS_DDI(dev_priv))
+			intel_set_pch_fifo_underrun_reporting(dev_priv, intel_crtc->pipe, true);
+	}
 }
 
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +0 -0
 /**
Signature · 6 lines
2.15.0

_______________________________________________
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

#5 lore raw

PATCH 3/3 drm/i915: Re-enable fastboot by default

In reply to Maarten Lankhorst

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.

Cc Jani Nikula <[email protected]>
Cc Daniel Vetter <[email protected]>

Testcase: kms_panel_fitting

---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
index c7292268ed43..b99cb58801e6 100644
@@ -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) \
Signature · 6 lines
2.15.0

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

Re: [PATCH (resend) 3/3] drm/i915: Re-enable fastboot by default

Quoted 11 lines · Maarten Lankhorst

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.

Cc Jani Nikula <[email protected]>
Cc Daniel Vetter <[email protected]>

Testcase: kms_panel_fitting

Mkay, per our irc discussion (pls add Ville to the cc of this patch) we need one more bit:

In the pipe state compare functions, when the old mode is inherited and either has_infoframes or has_audio (because of the eld crap) is set, then we need to force a full modeset. Since atm we don't patch that up properly. Maybe wrap that logic up into a PIPE_CONF_INCOMPLETE_STATE_CHECK macro or something like that:

#define PIPE_CONF_INCOMPLETE_STATE_CHECK(name)

if (current_config->flags & INHERITED) {
	if (current_config->name || pipe_config->name) {
		pipe_config_err(...)
		ret = false;
	}
}

Or something like that.

With that fixed I think/hope we're finally done with this thing. -Daniel

Quoted 20 lines
---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
index c7292268ed43..b99cb58801e6 100644
@@ -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) \
Signature · 1 line
2.15.0
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

✓ Fi.CI.BAT: success for series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
URL : https://patchwork.freedesktop.org/series/33395/
State : success

== Summary ==

Series 33395v1 series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
https://patchwork.freedesktop.org/api/1.0/series/33395/revisions/1/mbox/

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:445s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:452s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:379s
fi-bsw-n3050     total:289  pass:242  dwarn:1   dfail:0   fail:0   skip:46  time:533s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:273s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:499s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:501s
fi-byt-j1900     total:289  pass:254  dwarn:0   dfail:0   fail:0   skip:35  time:495s
fi-byt-n2820     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:484s
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:551s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:431s
fi-gdg-551       total:289  pass:172  dwarn:1   dfail:0   fail:7   skip:109 time:262s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:542s
fi-glk-dsi       total:289  pass:258  dwarn:0   dfail:0   fail:1   skip:30  time:490s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:430s
fi-hsw-4770r     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:438s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:426s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:463s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:490s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:481s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:569s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:543s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:559s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:528s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:455s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:552s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:421s

748f2c6b4046b23a623b4af3799563ef3110bb0d drm-tip: 2017y-11m-08d-07h-50m-13s UTC integration manifest aea2f7dd3563 drm/i915: Re-enable fastboot by default
39b9377913c3 drm/i915: Enable FIFO underrun reporting after initial fastset 08fba3d78503 drm/i915: Ignore previous watermarks on ILK if inherited

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7006/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

✓ Fi.CI.IGT: success for series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
URL : https://patchwork.freedesktop.org/series/33395/
State : success

== Summary ==

shard-hsw total:2540 pass:1431 dwarn:2 dfail:0 fail:10 skip:1097 time:9251s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7006/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

✗ Fi.CI.BAT: warning for series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
URL : https://patchwork.freedesktop.org/series/33395/
State : warning

== Summary ==

Series 33395v1 series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
https://patchwork.freedesktop.org/api/1.0/series/33395/revisions/1/mbox/

Test chamelium:

        Subgroup dp-crc-fast:
                fail       -> PASS       (fi-kbl-7500u) fdo#102514
Test gem_exec_reloc:
        Subgroup basic-cpu-active:
                pass       -> FAIL       (fi-gdg-551) fdo#102582 +5
        Subgroup basic-write-cpu-active:
                pass       -> DMESG-WARN (fi-bsw-n3050)
Test kms_flip:
        Subgroup basic-plain-flip:
                incomplete -> PASS       (fi-cnl-y) fdo#103339
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-c:
                pass       -> SKIP       (fi-hsw-4770r)

fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#103339 https://bugs.freedesktop.org/show_bug.cgi?id=103339

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:445s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:452s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:379s
fi-bsw-n3050     total:289  pass:242  dwarn:1   dfail:0   fail:0   skip:46  time:533s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:273s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:499s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:501s
fi-byt-j1900     total:289  pass:254  dwarn:0   dfail:0   fail:0   skip:35  time:495s
fi-byt-n2820     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:484s
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:551s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:431s
fi-gdg-551       total:289  pass:172  dwarn:1   dfail:0   fail:7   skip:109 time:262s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:542s
fi-glk-dsi       total:289  pass:258  dwarn:0   dfail:0   fail:1   skip:30  time:490s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:430s
fi-hsw-4770r     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:438s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:426s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:463s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:490s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:481s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:569s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:543s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:559s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:528s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:455s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:552s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:421s

748f2c6b4046b23a623b4af3799563ef3110bb0d drm-tip: 2017y-11m-08d-07h-50m-13s UTC integration manifest aea2f7dd3563 drm/i915: Re-enable fastboot by default
39b9377913c3 drm/i915: Enable FIFO underrun reporting after initial fastset 08fba3d78503 drm/i915: Ignore previous watermarks on ILK if inherited

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7006/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

✗ Fi.CI.BAT: warning for series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
URL : https://patchwork.freedesktop.org/series/33395/
State : warning

== Summary ==

Series 33395v1 series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
https://patchwork.freedesktop.org/api/1.0/series/33395/revisions/1/mbox/

Test chamelium:

        Subgroup dp-crc-fast:
                fail       -> PASS       (fi-kbl-7500u) fdo#102514
Test gem_exec_reloc:
        Subgroup basic-cpu-active:
                pass       -> FAIL       (fi-gdg-551) fdo#102582 +5
        Subgroup basic-write-cpu-active:
                pass       -> DMESG-WARN (fi-bsw-n3050)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-c:
                pass       -> SKIP       (fi-hsw-4770r)

fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:445s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:452s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:379s
fi-bsw-n3050     total:289  pass:242  dwarn:1   dfail:0   fail:0   skip:46  time:533s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:273s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:499s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:501s
fi-byt-j1900     total:289  pass:254  dwarn:0   dfail:0   fail:0   skip:35  time:495s
fi-byt-n2820     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:484s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:431s
fi-gdg-551       total:289  pass:172  dwarn:1   dfail:0   fail:7   skip:109 time:262s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:542s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:430s
fi-hsw-4770r     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:438s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:426s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:463s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:490s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:481s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:569s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:543s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:559s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:528s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:455s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:552s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:421s
Blacklisted hosts:
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:551s
fi-glk-dsi       total:289  pass:258  dwarn:0   dfail:0   fail:1   skip:30  time:490s

748f2c6b4046b23a623b4af3799563ef3110bb0d drm-tip: 2017y-11m-08d-07h-50m-13s UTC integration manifest aea2f7dd3563 drm/i915: Re-enable fastboot by default
39b9377913c3 drm/i915: Enable FIFO underrun reporting after initial fastset 08fba3d78503 drm/i915: Ignore previous watermarks on ILK if inherited

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7006/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

✗ Fi.CI.BAT: warning for series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
URL : https://patchwork.freedesktop.org/series/33395/
State : warning

== Summary ==

Series 33395v1 series starting with [(resend),1/3] drm/i915: Ignore previous watermarks on ILK if inherited
https://patchwork.freedesktop.org/api/1.0/series/33395/revisions/1/mbox/

Test chamelium:

        Subgroup dp-crc-fast:
                fail       -> PASS       (fi-kbl-7500u) fdo#102514
Test gem_exec_reloc:
        Subgroup basic-cpu-active:
                pass       -> FAIL       (fi-gdg-551) fdo#102582 +5
        Subgroup basic-write-cpu-active:
                pass       -> DMESG-WARN (fi-bsw-n3050)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-c:
                pass       -> SKIP       (fi-hsw-4770r)

fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:445s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:452s
fi-blb-e6850     total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:379s
fi-bsw-n3050     total:289  pass:242  dwarn:1   dfail:0   fail:0   skip:46  time:533s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:273s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:499s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:501s
fi-byt-j1900     total:289  pass:254  dwarn:0   dfail:0   fail:0   skip:35  time:495s
fi-byt-n2820     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:484s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:431s
fi-gdg-551       total:289  pass:172  dwarn:1   dfail:0   fail:7   skip:109 time:262s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:542s
fi-hsw-4770      total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:430s
fi-hsw-4770r     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:438s
fi-ilk-650       total:289  pass:228  dwarn:0   dfail:0   fail:0   skip:61  time:426s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:483s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:463s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:490s
fi-kbl-7567u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:481s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-pnv-d510      total:289  pass:222  dwarn:1   dfail:0   fail:0   skip:66  time:569s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6600u     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:543s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:559s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:528s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:455s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:552s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:421s
Blacklisted hosts:
fi-cnl-y         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:551s
fi-glk-dsi       total:289  pass:258  dwarn:0   dfail:0   fail:1   skip:30  time:490s

748f2c6b4046b23a623b4af3799563ef3110bb0d drm-tip: 2017y-11m-08d-07h-50m-13s UTC integration manifest aea2f7dd3563 drm/i915: Re-enable fastboot by default
39b9377913c3 drm/i915: Enable FIFO underrun reporting after initial fastset 08fba3d78503 drm/i915: Ignore previous watermarks on ILK if inherited

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7006/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw
In reply to Maarten Lankhorst
Quoted 10 lines · Maarten Lankhorst

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.

So I'm no expert on this, but why is this not needed for g4x and vlv intermediate wm? I think the commit message should explain that. I think it should also explain why simply shutting the above warnings up is safe.

I think once that's fixed I understand why we need this and why it works, but probably better to get an Ack from Ville to make sure. -Daniel

Quoted 26 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +3 -1
index 46440e2ecb33..9e8a0a9cac02 100644
@@ -3137,7 +3137,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;
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw

Op 08-11-17 om 16:41 schreef Daniel Vetter:

Quoted 10 lines · Maarten Lankhorst
Quoted 9 lines

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.

Quoted 8 lines
Quoted 1 line

So I'm no expert on this, but why is this not needed for g4x and vlv intermediate wm? I think the commit message should explain that. I think it should also explain why simply shutting the above warnings up is safe.

I think once that's fixed I understand why we need this and why it works, but probably better to get an Ack from Ville to make sure. -Daniel

True, reason it's not needed there is because intermediate calculation can't fail. And yeah best say because BIOS wm are bogus here.

Quoted 18 lines
Quoted 18 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +3 -1
index 46440e2ecb33..9e8a0a9cac02 100644
@@ -3137,7 +3137,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;
 
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +0 -0
 	a->pipe_enabled |= b->pipe_enabled;
Signature · 6 lines
2.15.0

_______________________________________________
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

Reviewed-by
#14 lore raw
Quoted 16 lines · Maarten Lankhorst

Op 08-11-17 om 16:41 schreef Daniel Vetter:

Quoted 15 lines · Maarten Lankhorst
Quoted 10 lines

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.

So I'm no expert on this, but why is this not needed for g4x and vlv intermediate wm? I think the commit message should explain that. I think it should also explain why simply shutting the above warnings up is safe.

Quoted 5 lines
Quoted 3 lines

I think once that's fixed I understand why we need this and why it works, but probably better to get an Ack from Ville to make sure. -Daniel

True, reason it's not needed there is because intermediate calculation can't fail. And yeah best say because BIOS wm are bogus here.

Ok, with that (maybe a bit more verbose) explained in the commit message:

Quoted 28 lines
Quoted 26 lines
Quoted 26 lines
---
 drivers/gpu/drm/i915/intel_pm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +3 -1
index 46440e2ecb33..9e8a0a9cac02 100644
@@ -3137,7 +3137,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;
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#15 lore raw

Op 09-11-17 om 11:41 schreef Daniel Vetter:

Quoted 17 lines · Maarten Lankhorst
Quoted 16 lines

Op 08-11-17 om 16:41 schreef Daniel Vetter:

Quoted 15 lines · Maarten Lankhorst
Quoted 10 lines

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.

So I'm no expert on this, but why is this not needed for g4x and vlv intermediate wm? I think the commit message should explain that. I think it should also explain why simply shutting the above warnings up is safe.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

I think once that's fixed I understand why we need this and why it works, but probably better to get an Ack from Ville to make sure. -Daniel

True, reason it's not needed there is because intermediate calculation can't fail. And yeah best say because BIOS wm are bogus here.

Ok, with that (maybe a bit more verbose) explained in the commit message:

Hm, something fishy is going on. This should have been caught by sanitize_watermarks() early during boot. More investigation is needed...
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx