* [PATCH resend for CI] drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only
@ 2016-03-22 8:11 Ander Conselvan de Oliveira
2016-03-22 10:33 ` ✗ Fi.CI.BAT: warning for drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2) Patchwork
0 siblings, 1 reply; 3+ messages in thread
From: Ander Conselvan de Oliveira @ 2016-03-22 8:11 UTC (permalink / raw)
To: intel-gfx; +Cc: Ander Conselvan de Oliveira, Kalyan Kondapally
The wait for other gens was added in commit 564ed191f5d8 ("drm/i915:
gmch: fix stuck primary plane due to memory self-refresh mode") since
that's necessary when disabling cxsr. However, cxsr disabling was later
moved to intel_pre_disable_primary() in commit 87d4300a7dbc ("drm/i915:
Move intel_(pre_disable/post_enable)_primary to intel_display.c, and use
it there.") and that function got its own vblank wait for cxsr in commit
262cd2e154c2 ("drm/i915: CHV DDR DVFS support and another watermark
rewrite"). So remove the extra vblank wait from i9xx_crtc_distable().
Cc: Kalyan Kondapally <kalyan.kondapally@intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 28ead66..17116a0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6266,10 +6266,9 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
/*
* On gen2 planes are double buffered but the pipe isn't, so we must
* wait for planes to fully turn off before disabling the pipe.
- * We also need to wait on all gmch platforms because of the
- * self-refresh mode constraint explained above.
*/
- intel_wait_for_vblank(dev, pipe);
+ if (IS_GEN2(dev))
+ intel_wait_for_vblank(dev, pipe);
for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->disable(encoder);
--
2.4.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2)
2016-03-22 8:11 [PATCH resend for CI] drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only Ander Conselvan de Oliveira
@ 2016-03-22 10:33 ` Patchwork
2016-03-23 12:26 ` Ander Conselvan De Oliveira
0 siblings, 1 reply; 3+ messages in thread
From: Patchwork @ 2016-03-22 10:33 UTC (permalink / raw)
To: Ander Conselvan de Oliveira; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2)
URL : https://patchwork.freedesktop.org/series/3496/
State : warning
== Summary ==
Series 3496v2 drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only
http://patchwork.freedesktop.org/api/1.0/series/3496/revisions/2/mbox/
Test kms_flip:
Subgroup basic-flip-vs-dpms:
dmesg-warn -> PASS (ilk-hp8440p) UNSTABLE
Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Subgroup basic-plain-flip:
pass -> DMESG-WARN (snb-x220t)
dmesg-warn -> PASS (bdw-ultra)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a:
pass -> DMESG-WARN (bdw-ultra)
Subgroup suspend-read-crc-pipe-c:
dmesg-warn -> PASS (bsw-nuc-2)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> DMESG-WARN (snb-dellxps)
Subgroup basic-rte:
dmesg-warn -> PASS (snb-x220t)
pass -> DMESG-WARN (bsw-nuc-2)
dmesg-warn -> PASS (snb-dellxps)
dmesg-warn -> PASS (byt-nuc) UNSTABLE
bdw-nuci7 total:192 pass:180 dwarn:0 dfail:0 fail:0 skip:12
bdw-ultra total:192 pass:170 dwarn:1 dfail:0 fail:0 skip:21
bsw-nuc-2 total:192 pass:154 dwarn:1 dfail:0 fail:0 skip:37
byt-nuc total:192 pass:157 dwarn:0 dfail:0 fail:0 skip:35
hsw-brixbox total:192 pass:170 dwarn:0 dfail:0 fail:0 skip:22
ilk-hp8440p total:192 pass:128 dwarn:1 dfail:0 fail:0 skip:63
ivb-t430s total:192 pass:167 dwarn:0 dfail:0 fail:0 skip:25
skl-i5k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23
skl-i7k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23
snb-dellxps total:192 pass:157 dwarn:1 dfail:0 fail:0 skip:34
snb-x220t total:192 pass:157 dwarn:1 dfail:0 fail:1 skip:33
Results at /archive/results/CI_IGT_test/Patchwork_1669/
4b39223f6e3bef4dfa678f7239dcd87c38e20e96 drm-intel-nightly: 2016y-03m-21d-18h-43m-18s UTC integration manifest
4cf35a584e45c7b79ec93be893a10380567d86b7 drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ✗ Fi.CI.BAT: warning for drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2)
2016-03-22 10:33 ` ✗ Fi.CI.BAT: warning for drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2) Patchwork
@ 2016-03-23 12:26 ` Ander Conselvan De Oliveira
0 siblings, 0 replies; 3+ messages in thread
From: Ander Conselvan De Oliveira @ 2016-03-23 12:26 UTC (permalink / raw)
To: intel-gfx
On Tue, 2016-03-22 at 10:33 +0000, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2)
> URL : https://patchwork.freedesktop.org/series/3496/
> State : warning
>
> == Summary ==
>
> Series 3496v2 drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only
> http://patchwork.freedesktop.org/api/1.0/series/3496/revisions/2/mbox/
>
> Test kms_flip:
> Subgroup basic-flip-vs-dpms:
> dmesg-warn -> PASS (ilk-hp8440p) UNSTABLE
> Subgroup basic-flip-vs-modeset:
> pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
*ERROR* CPU pipe A FIFO underrun
https://bugs.freedesktop.org/show_bug.cgi?id=93787
> Subgroup basic-plain-flip:
> pass -> DMESG-WARN (snb-x220t)
Device suspended during HW access
https://bugs.freedesktop.org/show_bug.cgi?id=94349
> dmesg-warn -> PASS (bdw-ultra)
> Test kms_pipe_crc_basic:
> Subgroup read-crc-pipe-a:
> pass -> DMESG-WARN (bdw-ultra)
Device suspended during HW access
https://bugs.freedesktop.org/show_bug.cgi?id=94349
> Subgroup suspend-read-crc-pipe-c:
> dmesg-warn -> PASS (bsw-nuc-2)
> Test pm_rpm:
> Subgroup basic-pci-d3-state:
> pass -> DMESG-WARN (snb-dellxps)
Device suspended during HW access
https://bugs.freedesktop.org/show_bug.cgi?id=94349
> Subgroup basic-rte:
> dmesg-warn -> PASS (snb-x220t)
> pass -> DMESG-WARN (bsw-nuc-2)
*ERROR* Unclaimed access detected prior to suspending
https://bugs.freedesktop.org/show_bug.cgi?id=94164
Patch pushed.
Thanks,
Ander
> dmesg-warn -> PASS (snb-dellxps)
> dmesg-warn -> PASS (byt-nuc) UNSTABLE
>
> bdw-nuci7 total:192 pass:180 dwarn:0 dfail:0 fail:0 skip:12
> bdw-ultra total:192 pass:170 dwarn:1 dfail:0 fail:0 skip:21
> bsw-nuc-2 total:192 pass:154 dwarn:1 dfail:0 fail:0 skip:37
> byt-nuc total:192 pass:157 dwarn:0 dfail:0 fail:0 skip:35
> hsw-brixbox total:192 pass:170 dwarn:0 dfail:0 fail:0 skip:22
> ilk-hp8440p total:192 pass:128 dwarn:1 dfail:0 fail:0 skip:63
> ivb-t430s total:192 pass:167 dwarn:0 dfail:0 fail:0 skip:25
> skl-i5k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23
> skl-i7k-2 total:192 pass:169 dwarn:0 dfail:0 fail:0 skip:23
> snb-dellxps total:192 pass:157 dwarn:1 dfail:0 fail:0 skip:34
> snb-x220t total:192 pass:157 dwarn:1 dfail:0 fail:1 skip:33
>
> Results at /archive/results/CI_IGT_test/Patchwork_1669/
>
> 4b39223f6e3bef4dfa678f7239dcd87c38e20e96 drm-intel-nightly: 2016y-03m-21d-18h
> -43m-18s UTC integration manifest
> 4cf35a584e45c7b79ec93be893a10380567d86b7 drm/i915: Wait for vblank in
> i9xx_disable_crtc() for gen 2 only
>
> _______________________________________________
> 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] 3+ messages in thread
end of thread, other threads:[~2016-03-23 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-22 8:11 [PATCH resend for CI] drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only Ander Conselvan de Oliveira
2016-03-22 10:33 ` ✗ Fi.CI.BAT: warning for drm/i915: Wait for vblank in i9xx_disable_crtc() for gen 2 only (rev2) Patchwork
2016-03-23 12:26 ` Ander Conselvan De Oliveira
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.