All of lore.kernel.org
 help / color / mirror / Atom feed
* [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
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.