xf86-video-intel: Branch 'modesetting' - 2 commits - src/i830_dri.c src/i830_xf86Crtc.c

[Eric Anholt]

 src/i830_dri.c      |   17 +++++++++++++----
 src/i830_xf86Crtc.c |    1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
diff-tree b3865f34669319f449f2da8f87a4eef6ec8e7804 (from 24d9521c7ae72e146025f10ea85b07ebd7041716)
Author: Joshua J. Berry <des at condordes.net>
Date:   Mon Dec 11 14:46:20 2006 -0800

    Include i830.h to get M_T_* compat defines for older X Servers.
    
    Not duplicating the defines ensures that we won't let the compat bits slip
    into the X Server when we move this code over there.

diff --git a/src/i830_xf86Crtc.c b/src/i830_xf86Crtc.c
index 3a592e5..448d4f9 100644
--- a/src/i830_xf86Crtc.c
+++ b/src/i830_xf86Crtc.c
@@ -32,6 +32,7 @@
 
 #include "xf86.h"
 #include "xf86DDC.h"
+#include "i830.h"
 #include "i830_xf86Crtc.h"
 #include "X11/extensions/render.h"
 
diff-tree 24d9521c7ae72e146025f10ea85b07ebd7041716 (from fde52de870c84821ab457e17634c334a10cf71ab)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 11 09:34:50 2006 -0800

    Add error messages for previous silent DRI initialization failures.

diff --git a/src/i830_dri.c b/src/i830_dri.c
index b320633..0f6145b 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -426,15 +426,24 @@ I830CheckDRIAvailable(ScrnInfoPtr pScrn)
 
    /* Check that the GLX, DRI, and DRM modules have been loaded by testing
     * for known symbols in each module. */
-   if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs"))
+   if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		 "[dri] %s failed: glx not loaded\n", __FUNCTION__);
       return FALSE;
-   if (!xf86LoaderCheckSymbol("DRIScreenInit"))
+   }
+   if (!xf86LoaderCheckSymbol("DRIScreenInit")) {
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		 "[dri] %s failed: dri not loaded\n", __FUNCTION__);
       return FALSE;
-   if (!xf86LoaderCheckSymbol("drmAvailable"))
+   }
+   if (!xf86LoaderCheckSymbol("drmAvailable")) {
+      xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+		 "[dri] %s failed: libdrm not loaded\n", __FUNCTION__);
       return FALSE;
+   }
    if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		 "[dri] %s failed (libdri.a too old)\n", "I830CheckDRIAvailable");
+		 "[dri] %s failed (libdri.a too old)\n", __FUNCTION__);
       return FALSE;
    }