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

[Eric Anholt]

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

New commits:
diff-tree 293ad158ece941eeb9894f5af4d663464b9954e5 (from ff1223142aedcf888665de6e4d7d5d03a55b2688)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 19 14:35:51 2006 -0800

    Remove 8k framebuffer stride restriction on 965.
    
    Also, clean up the message if the limitation is hit.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 09488ab..7309675 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1840,8 +1840,9 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
 #endif
       pI830->disableTiling = TRUE; /* no DRI - so disableTiling */
 
-   if (pScrn->displayWidth * pI830->cpp > 8192) {
-      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot support frame buffer stride > 8K >  DRI.\n");
+   if (!IS_I965G(pI830) && pScrn->displayWidth * pI830->cpp > 8192) {
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		 "Cannot support DRI with frame buffer stride > 8K.\n");
       pI830->disableTiling = TRUE;
       pI830->directRenderingDisabled = TRUE;
    }