xf86-video-intel: Branch 'glucose' - 3 commits - src/i830_dri.c src/i830_video.c

[Jose Fonseca]

 src/i830_dri.c   |   34 +++++++++++++---------------------
 src/i830_video.c |    2 +-
 2 files changed, 14 insertions(+), 22 deletions(-)

New commits:
diff-tree 587db7d2c0489f89ec659aaa94f61cc3ad27259c (from 5542cc9a8e2f12d24ab514058f46ff078e0283a0)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Tue Sep 25 09:09:21 2007 +0100

    Ensure proper operator precedence (per Michel Danzer).

diff --git a/src/i830_video.c b/src/i830_video.c
index ac78fdf..8243c69 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2402,7 +2402,7 @@ I830PutImage(ScrnInfoPtr pScrn,
     }
 #endif
 
-    if (!pI830->AccelMethod == USE_EXA &&
+    if (pI830->AccelMethod != USE_EXA &&
 	    (((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
 	     ((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
 	      pI830->FbMapSize))) {
diff-tree 5542cc9a8e2f12d24ab514058f46ff078e0283a0 (from parents)
Merge: 6ce6c6849d0d99ec2a94086a2928da5cf700b2a3 ca67fa767dc762dac369e84b27a7ef15673d527c
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Mon Sep 24 22:57:57 2007 +0100

    Merge commit 'origin/master' into glucose

diff-tree ca67fa767dc762dac369e84b27a7ef15673d527c (from 130f79613bfe6a8cfa7f431c8cce06cbb93cc91a)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Sep 24 11:12:22 2007 -0700

    Remove logic for supporting i915tex_dri.so vs. i915_dri.so.
    
    There can be only one.

diff --git a/src/i830_dri.c b/src/i830_dri.c
index bff885e..6fe75e5 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -102,11 +102,6 @@ typedef struct drm_i915_flip {
 
 #include "dristruct.h"
 
-static char I830KernelDriverName[] = "i915";
-static char I830ClientDriverName[] = "i915tex";
-static char I965ClientDriverName[] = "i965";
-static char I830LegacyClientDriverName[] = "i915";
-
 static Bool I830InitVisualConfigs(ScreenPtr pScreen);
 static Bool I830CreateContext(ScreenPtr pScreen, VisualPtr visual,
 			      drm_context_t hwContext, void *pVisualConfigPriv,
@@ -538,11 +533,11 @@ I830DRIScreenInit(ScreenPtr pScreen)
    pI830->pDRIInfo = pDRIInfo;
    pI830->LockHeld = 0;
 
-   pDRIInfo->drmDriverName = I830KernelDriverName;
+   pDRIInfo->drmDriverName = "i915";
    if (IS_I965G(pI830))
-      pDRIInfo->clientDriverName = I965ClientDriverName;
-   else 
-      pDRIInfo->clientDriverName = I830ClientDriverName;
+      pDRIInfo->clientDriverName = "i965";
+   else
+      pDRIInfo->clientDriverName = "i915";
 
    if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
       pDRIInfo->busIdString = DRICreatePCIBusID(pI830->PciInfo);
@@ -719,9 +714,15 @@ I830DRIScreenInit(ScreenPtr pScreen)
 	    drmFreeVersion(version);
 	    return FALSE;
 	 }
-	 if (strncmp(version->name, I830KernelDriverName, strlen(I830KernelDriverName))) {
-	    xf86DrvMsg(pScreen->myNum, X_WARNING, 
-			"i830 Kernel module detected, Use the i915 Kernel module instead, aborting DRI init.\n");
+	 /* Check whether the kernel module attached to the device isn't the
+	  * one we expected (meaning it's the old i830 module).
+	  */
+	 if (strncmp(version->name, pDRIInfo->drmDriverName,
+		     strlen(pDRIInfo->drmDriverName)))
+	 {
+	    xf86DrvMsg(pScreen->myNum, X_WARNING,
+		       "Detected i830 kernel module.  The i915 kernel module "
+		       "is required for DRI.  Aborting.\n");
 	    I830DRICloseScreen(pScreen);
 	    drmFreeVersion(version);
 	    return FALSE;
@@ -739,15 +740,6 @@ I830DRIScreenInit(ScreenPtr pScreen)
       }
    }
 
-   /*
-    * Backwards compatibility
-    */
-
-   if ((pDRIInfo->clientDriverName == I830ClientDriverName) && 
-       (pI830->allocate_classic_textures)) {
-      pDRIInfo->clientDriverName = I830LegacyClientDriverName;
-   }
-
    return TRUE;
 }