xf86-video-ati: Branch 'master'

[George Sapountzis]

 configure.ac |    2 +-
 src/atidri.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree f917f65e8d2b13d8b9bfc4320f4a935f5a5c4bff (from ca8c148942371c9445f32985625ce38eabc016e1)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Thu Nov 2 21:16:53 2006 +0200

    Officially require libdrm 2.2.0
    
    Note that this is only for the headers at compile-time. The driver still
    uses libdrm 1.2.0 from Xserver at run-time.

diff --git a/configure.ac b/configure.ac
index ca69b0e..4aa6159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ AC_MSG_RESULT([$DRI])
 
 AM_CONDITIONAL(DRI, test x$DRI = xyes)
 if test "$DRI" = yes; then
-	PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
+	PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
 	if test "$have_damage_h" = yes; then
diff --git a/src/atidri.c b/src/atidri.c
index 2bc6d84..cd57874 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -1378,7 +1378,7 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen
 	 /* Incompatible DRM version */
 	 xf86DrvMsg( pScreen->myNum, X_ERROR,
 		     "[dri] ATIDRIScreenInit failed because of a version mismatch.\n"
-		     "[dri] mach64.o kernel module version is %d.%d.%d, but version 1.0 or greater is needed.\n"
+		     "[dri] mach64.o kernel module version is %d.%d.%d, but version 2.x is needed (with 2.x >= 2.0).\n"
 		     "[dri] Disabling DRI.\n",
 		     version->version_major,
 		     version->version_minor,