xf86-video-intel: 2 commits - src/i830_driver.c

[Zhenyu Wang]

 src/i830_driver.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 581509321e51becb8ee6ddcfaa15a2a713c9ef8e
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Wed Nov 14 22:16:04 2007 +0800

    Remove one redundant line.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index debe539..8d58a08 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2606,8 +2606,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
       pI830->directRenderingEnabled = FALSE;
    }
 
-   pScrn->displayWidth = pScrn->displayWidth;
-
 #ifdef HAS_MTRR_SUPPORT
    {
       int fd;
commit 8cea3c8cfa86600b5f2c3e1f21c19d4b2a320fd4
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Wed Nov 14 22:13:30 2007 +0800

    Don't setup fb compression if fb is not tiling

diff --git a/src/i830_driver.c b/src/i830_driver.c
index fdbf9ec..debe539 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2560,6 +2560,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 		    "Attempting memory allocation with %s buffers.\n",
 		    (i & 1) ? "untiled" : "tiled");
 
+	 if (!pI830->tiling && pI830->fb_compression)
+	     pI830->fb_compression = FALSE;
+
 	 if (i830_allocate_2d_memory(pScrn) &&
 	     i830_allocate_3d_memory(pScrn))
 	 {