diff options
| author | Vladimir Dergachev <volodya@mindspring.com> | 2004-12-12 19:28:37 +0000 |
|---|---|---|
| committer | Vladimir Dergachev <volodya@mindspring.com> | 2004-12-12 19:28:37 +0000 |
| commit | 8a9077bc70fd800983f138a224b95301992a2296 (patch) | |
| tree | ec13e01205f369c702dc023375229e13d01d2064 /src/radeon_dri.c | |
| parent | 845df6dd96785b59c44c670009c4fcdb20e147ab (diff) | |
Modified:
programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
Enable DRM support permanently, allowing its use for any CHIP_FAMILY >
R300. Fix bug in naming Mesa3d driver (it was defaulting to r200)
Diffstat (limited to 'src/radeon_dri.c')
| -rw-r--r-- | src/radeon_dri.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c index fc32fd9a..73349620 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -1255,14 +1255,12 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) info->pDRIInfo = pDRIInfo; pDRIInfo->drmDriverName = RADEON_DRIVER_NAME; + if ( (info->ChipFamily >= CHIP_FAMILY_R300) ) { + pDRIInfo->clientDriverName = R300_DRIVER_NAME; + } else if ( info->ChipFamily >= CHIP_FAMILY_R200 ) pDRIInfo->clientDriverName = R200_DRIVER_NAME; else - if ( (info->ChipFamily == CHIP_FAMILY_R300) || - (info->ChipFamily == CHIP_FAMILY_R350) || - (info->ChipFamily == CHIP_FAMILY_RV350) ) { - pDRIInfo->clientDriverName = R300_DRIVER_NAME; - } else pDRIInfo->clientDriverName = RADEON_DRIVER_NAME; if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) { |