xf86-video-intel: Branch 'glucose' - src/i830_driver.c src/i830_memory.c

[Alan Hourihane]

 src/i830_driver.c |    2 +-
 src/i830_memory.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 7d104e257462dcb2e125f1a95d093e9627145b50 (from 587db7d2c0489f89ec659aaa94f61cc3ad27259c)
Author: Alan Hourihane <alanh at localhost.(none)>
Date:   Tue Sep 25 22:01:35 2007 +0100

    Fix merge

diff --git a/src/i830_driver.c b/src/i830_driver.c
index ec71555..598b7fd 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2721,6 +2721,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
     * Also make sure the DRM can handle the swap.
     */
    if (I830LVDSPresent(pScrn) && !IS_I965GM(pI830) &&
+	pI830->fb_compression &&
        (!pI830->directRenderingEnabled ||
 	(pI830->directRenderingEnabled && pI830->drmMinor >= 10))) {
        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "adjusting plane->pipe mappings "
@@ -2735,7 +2736,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
 	       intel_crtc->plane = 0;
       }
    }
-
 #else
    pI830->directRenderingEnabled = FALSE;
 #endif
diff --git a/src/i830_memory.c b/src/i830_memory.c
index f614d1b..d372d22 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1154,7 +1154,7 @@ i830_allocate_framebuffer(ScrnInfoPtr pS
      * acceleration operations (non-XY COLOR_BLT) can't be done to tiled
      * buffers.
      */
-    if (!(pI830->AccelMethod == USE_EXA) && IS_I965G(pI830))
+    if ((pI830->AccelMethod != USE_EXA) && IS_I965G(pI830))
 	tiling = FALSE;
     else
 	tiling = pI830->tiling;