From eb09014ce10428bbcab04e155186382975545f0a Mon Sep 17 00:00:00 2001
From: Li Peng <peng.li@intel.com>
Date: Tue, 16 Jun 2009 15:29:57 -0700
Subject: [PATCH] don't wait for vblank on rotated displays

We may hang or wait for the wrong line if the display is rotated, so just skip
the wait in that case.

Fixes fdo bug #22196.
---
 src/i830_dri.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i830_dri.c b/src/i830_dri.c
index c28f3ab7..d00b42c8 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -309,7 +309,8 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 	box = REGION_EXTENTS(unused, pGC->pCompositeClip);
 	crtc = i830_covering_crtc(pScrn, box, NULL, &crtcbox);
 
-	if (crtc != NULL) {
+	/* Make sure the CRTC is valid and this is the real front buffer */
+	if (crtc != NULL && !crtc->rotatedData) {
 	    if (pI830->use_drm_mode)
 		pipe = drmmode_get_pipe_from_crtc_id(pI830->bufmgr, crtc);
 	    else {