xf86-video-ati: Branch 'master'

[Michel Daenzer]

 src/radeon_dri.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0378c8ed88c829f09b5c6d51314325eaf2685fdb
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sat Jun 28 14:06:45 2008 +0200

    Restore versioning of interface for Mesa DRI driver.
    
    This doesn't have anything to do with the package version.

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index ea3fa2e..63c0360 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1453,9 +1453,9 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
 		PCI_DEV_DEV(info->PciInfo),
 		PCI_DEV_FUNC(info->PciInfo));
     }
-    pDRIInfo->ddxDriverMajorVersion      = RADEON_VERSION_MAJOR;
-    pDRIInfo->ddxDriverMinorVersion      = RADEON_VERSION_MINOR;
-    pDRIInfo->ddxDriverPatchVersion      = RADEON_VERSION_PATCH;
+    pDRIInfo->ddxDriverMajorVersion      = info->allowColorTiling ? 5 : 4;
+    pDRIInfo->ddxDriverMinorVersion      = 3;
+    pDRIInfo->ddxDriverPatchVersion      = 0;
     pDRIInfo->frameBufferPhysicalAddress = (void *)info->LinearAddr + info->frontOffset;
     pDRIInfo->frameBufferSize            = info->FbMapSize - info->FbSecureSize;
     pDRIInfo->frameBufferStride          = (pScrn->displayWidth *