diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2011-05-02 21:48:07 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2011-05-02 21:48:07 +0000 |
| commit | 8830588d7b8e457a085ffb7c0a7befd318cdf34d (patch) | |
| tree | 72d87178fb4c373789aa340bb4921ba73554e47e /driver | |
| parent | 22a505e9b0e2ccbf4da88e4c3dffe8ea98a0edc5 (diff) | |
Choose the r600 driver for r600+ chipsets, not r300.
This should stop the annoying errors for gl on r{6,7}00 chipsets.
Support for GL on these cards is coming soon.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_dri.c | 7 | ||||
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_version.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/driver/xf86-video-ati/src/radeon_dri.c b/driver/xf86-video-ati/src/radeon_dri.c index 25906879c..15021a1d6 100644 --- a/driver/xf86-video-ati/src/radeon_dri.c +++ b/driver/xf86-video-ati/src/radeon_dri.c @@ -1538,10 +1538,11 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) info->dri->pDRIInfo = pDRIInfo; pDRIInfo->drmDriverName = RADEON_DRIVER_NAME; - if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) { + if ( (info->ChipFamily >= CHIP_FAMILY_R600) ) + pDRIInfo->clientDriverName = R600_DRIVER_NAME; + else if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) pDRIInfo->clientDriverName = R300_DRIVER_NAME; - } else - if ( info->ChipFamily >= CHIP_FAMILY_R200 ) + else if ( info->ChipFamily >= CHIP_FAMILY_R200 ) pDRIInfo->clientDriverName = R200_DRIVER_NAME; else pDRIInfo->clientDriverName = RADEON_DRIVER_NAME; diff --git a/driver/xf86-video-ati/src/radeon_version.h b/driver/xf86-video-ati/src/radeon_version.h index 5717eade4..129046d7b 100644 --- a/driver/xf86-video-ati/src/radeon_version.h +++ b/driver/xf86-video-ati/src/radeon_version.h @@ -38,6 +38,7 @@ #define RADEON_DRIVER_NAME "radeon" #define R200_DRIVER_NAME "r200" #define R300_DRIVER_NAME "r300" +#define R600_DRIVER_NAME "r600" #define RADEON_VERSION_MAJOR PACKAGE_VERSION_MAJOR #define RADEON_VERSION_MINOR PACKAGE_VERSION_MINOR |