[Intel-gfx] [PATCH] DRI2: Don't swap pipes under DRI2

[Li Peng]

Resend to fix patch format

>From ea9fc2a5c4737d26464bb4533ff0c8af739f42f4 Mon Sep 17 00:00:00 2001
From: Li Peng <peng.li at intel.com>
Date: Thu, 8 Jan 2009 10:13:05 +0800
Subject: Don't swap pipes under DRI2, it fixes VT switch failure on 945GM

Signed-off-by: Li Peng <peng.li at intel.com>
---
 src/i830_driver.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index beb134d..5489890 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2960,6 +2960,7 @@ I830SwapPipes(ScrnInfoPtr pScrn)
     * Also make sure the DRM can handle the swap.
     */
    if (I830LVDSPresent(pScrn) && !IS_I965GM(pI830) && !IS_GM45(pI830) &&
+       (pI830->directRenderingType != DRI_DRI2) &&
        (pI830->directRenderingType != DRI_XF86DRI ||
 	(pI830->directRenderingType == DRI_XF86DRI && pI830->drmMinor >= 10))) {
        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "adjusting plane->pipe mappings "
-- 
1.5.5.1