Skip to contentSkip to conversation

drm/i915: Fix assert_sprites_disabled for SKL+

PATCH In review Maarten Lankhorst 3 participants 3 messages Aug 22, 2016

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

PATCH 1/1 drm/i915: Fix assert_sprites_disabled for SKL+

On skylake+ the primary plane is plane 0, and plane 1 is the first sprite plane. Other callsites handle this correctly.

---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index 1428d0c1a441..3b1f2c28fbd0 100644
@@ -1325,7 +1325,7 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,
 
 	if (INTEL_INFO(dev)->gen >= 9) {
 		for_each_sprite(dev_priv, pipe, sprite) {
-			u32 val = I915_READ(PLANE_CTL(pipe, sprite));
+			u32 val = I915_READ(PLANE_CTL(pipe, sprite + 1));
 			I915_STATE_WARN(val & PLANE_CTL_ENABLE,
 			     "plane %d assertion failure, should be off on pipe %c but is still active\n",
 			     sprite, pipe_name(pipe));
Signature · 6 lines
2.7.4

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

On skylake+ the primary plane is plane 0, and plane 1 is the first sprite plane. Other callsites handle this correctly.

---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 1428d0c1a441..3b1f2c28fbd0 100644

drivers/gpu/drm/i915/intel_display.c static void assert_sprites_disabled(struct drm_i915_private *dev_priv, · line 1331

Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -1325,7 +1325,7 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv,
 
 	if (INTEL_INFO(dev)->gen >= 9) {
 		for_each_sprite(dev_priv, pipe, sprite) {
-			u32 val = I915_READ(PLANE_CTL(pipe, sprite));
+			u32 val = I915_READ(PLANE_CTL(pipe, sprite + 1));
 			I915_STATE_WARN(val & PLANE_CTL_ENABLE,
 			     "plane %d assertion failure, should be off on pipe %c but is still active\n",
 			     sprite, pipe_name(pipe));

Mind fixing that INTEL_INFO(dev)->gen to INTEL_GEN(dev_priv) while at it? Obviously it's not introduced by your code, but it's something that should eventually be fixed anyway, so while it's in near patch context and doesn't end up causing too much noise it's nice to get it done piece by piece.

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

#2 lore raw

✗ Ro.CI.BAT: failure for drm/i915: Fix assert_sprites_disabled for SKL+

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Fix assert_sprites_disabled for SKL+
URL : https://patchwork.freedesktop.org/series/11401/
State : failure

== Summary ==

Series 11401v1 drm/i915: Fix assert_sprites_disabled for SKL+
http://patchwork.freedesktop.org/api/1.0/series/11401/revisions/1/mbox

Test kms_cursor_legacy:

        Subgroup basic-cursor-vs-flip-legacy:
                dmesg-warn -> PASS       (ro-bdw-i5-5250u)
        Subgroup basic-flip-vs-cursor-legacy:
                pass       -> FAIL       (ro-byt-n2820)
                pass       -> FAIL       (ro-skl3-i5-6260u)
                pass       -> DMESG-FAIL (fi-skl-i7-6700k)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-a-frame-sequence:
                pass       -> FAIL       (ro-byt-n2820)
fi-hsw-i7-4770k  total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-qkkr      total:244  pass:185  dwarn:30  dfail:0   fail:2   skip:27 
fi-skl-i7-6700k  total:244  pass:208  dwarn:4   dfail:2   fail:2   skip:28 
fi-snb-i7-2600   total:244  pass:202  dwarn:0   dfail:0   fail:0   skip:42 
ro-bdw-i5-5250u  total:240  pass:220  dwarn:3   dfail:0   fail:0   skip:17 
ro-bdw-i7-5557U  total:240  pass:219  dwarn:3   dfail:0   fail:0   skip:18 
ro-bdw-i7-5600u  total:240  pass:206  dwarn:0   dfail:0   fail:2   skip:32 
ro-bsw-n3050     total:240  pass:194  dwarn:0   dfail:0   fail:4   skip:42 
ro-byt-n2820     total:240  pass:195  dwarn:0   dfail:0   fail:5   skip:40 
ro-hsw-i3-4010u  total:240  pass:213  dwarn:0   dfail:0   fail:1   skip:26 
ro-hsw-i7-4770r  total:240  pass:185  dwarn:0   dfail:0   fail:0   skip:55 
ro-ilk1-i5-650   total:235  pass:174  dwarn:0   dfail:0   fail:2   skip:59 
ro-ivb-i7-3770   total:240  pass:204  dwarn:0   dfail:0   fail:1   skip:35 
ro-ivb2-i7-3770  total:240  pass:208  dwarn:0   dfail:0   fail:1   skip:31 
ro-skl3-i5-6260u total:240  pass:222  dwarn:0   dfail:0   fail:4   skip:14 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1960/

6e092ef drm-intel-nightly: 2016y-08m-22d-07h-37m-35s UTC integration manifest acaa547 drm/i915: Fix assert_sprites_disabled for SKL+

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