xf86-video-intel: src/i830_dri.c

[Jesse Barnes]

 src/i830_dri.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit eb09014ce10428bbcab04e155186382975545f0a
Author: Li Peng <peng.li at intel.com>
Date:   Tue Jun 16 15:29:57 2009 -0700

    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.

diff --git a/src/i830_dri.c b/src/i830_dri.c
index c28f3ab..d00b42c 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 {