xf86-video-ati: Branch 'master'
Brice Goglin
bgoglin at kemper.freedesktop.org
Fri Jun 27 09:32:34 PDT 2008
src/radeon_dri.c | 3 +--
src/radeon_version.h | 7 +++----
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit af79a77e6d8206b18bba97cf4e0770921dc439a7
Author: Brice Goglin <Brice.Goglin at ens-lyon.org>
Date: Fri Jun 27 17:09:13 2008 +0200
use PACKAGE_VERSION_* for radeon version
now radeon shows verion 6.9.0 instead of 4.3.0.
RADEON_VERSION_MAJOR_TILED is dropped from ddxDriverMajorVersion
since RADEON_VERSION_MAJOR is bigger now.
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 0fc03e4..ea3fa2e 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1453,8 +1453,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
PCI_DEV_DEV(info->PciInfo),
PCI_DEV_FUNC(info->PciInfo));
}
- pDRIInfo->ddxDriverMajorVersion = info->allowColorTiling ?
- RADEON_VERSION_MAJOR_TILED : RADEON_VERSION_MAJOR;
+ pDRIInfo->ddxDriverMajorVersion = RADEON_VERSION_MAJOR;
pDRIInfo->ddxDriverMinorVersion = RADEON_VERSION_MINOR;
pDRIInfo->ddxDriverPatchVersion = RADEON_VERSION_PATCH;
pDRIInfo->frameBufferPhysicalAddress = (void *)info->LinearAddr + info->frontOffset;
diff --git a/src/radeon_version.h b/src/radeon_version.h
index ccc1367..5717ead 100644
--- a/src/radeon_version.h
+++ b/src/radeon_version.h
@@ -39,10 +39,9 @@
#define R200_DRIVER_NAME "r200"
#define R300_DRIVER_NAME "r300"
-#define RADEON_VERSION_MAJOR 4
-#define RADEON_VERSION_MAJOR_TILED 5
-#define RADEON_VERSION_MINOR 3
-#define RADEON_VERSION_PATCH 0
+#define RADEON_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define RADEON_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define RADEON_VERSION_PATCH PACKAGE_VERSION_PATCHLEVEL
#ifndef RADEON_VERSION_EXTRA
#define RADEON_VERSION_EXTRA ""
More information about the xorg-commit
mailing list