mesa: Branch 'master'

[Ben Skeggs]

 src/mesa/drivers/dri/nouveau/nouveau_screen.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 42bd32dad7f2bd9b4c4df8a7394328d31748f1f5 (from 844e5610de6ffe6966072d120b50db541ea85104)
Author: Ben Skeggs <darktama at iinet.net.au>
Date:   Thu Jan 25 11:56:45 2007 +1100

    nouveau: some extra debug output

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 781ba01..2d14a9d 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -339,8 +339,11 @@ void * __driCreateNewScreen_20050727( __
 	}
 
 	// temporary lock step versioning
-	if (drm_expected.patch!=drm_version->patch)
+	if (drm_expected.patch!=drm_version->patch) {
+		__driUtilMessage("%s: wrong DRM version, expected %d, got %d\n",
+				drm_expected.patch, drm_version->patch);
 		return NULL;
+	}
 
 	psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
 				       ddx_version, dri_version, drm_version,