summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Dergachev <volodya@mindspring.com>2005-03-04 22:21:40 +0000
committerVladimir Dergachev <volodya@mindspring.com>2005-03-04 22:21:40 +0000
commit9b994b40710103b263364153429ebdb9ea3f58ed (patch)
tree9a5d2285bfbc7fb793ed2bd5f89c407b80db8db8
parent7d37a9f1f9fffe98067c3b5bc4749cc799fb0c77 (diff)
programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c Let through all chips
R300 and above - presumably the filtering should take place at the DRM driver level. Correct cut'n'paste position misprint. Big thanks for Michel Danzer for pointing out both improvements.
-rw-r--r--src/radeon_dri.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 5eba455..1bf3ed7 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1035,10 +1035,7 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
drmRadeonInit drmInfo;
memset(&drmInfo, 0, sizeof(drmRadeonInit));
- if ( (info->ChipFamily == CHIP_FAMILY_R300) ||
- (info->ChipFamily == CHIP_FAMILY_R350) ||
- (info->ChipFamily == CHIP_FAMILY_RV350) ||
- (info->ChipFamily == CHIP_FAMILY_R420) )
+ if ( info->ChipFamily >= CHIP_FAMILY_R300 )
drmInfo.func = DRM_RADEON_INIT_R300_CP;
else
if ( info->ChipFamily >= CHIP_FAMILY_R200 )
@@ -1391,12 +1388,12 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
if (info->IsIGP) {
req_minor = 10;
req_patch = 0;
- } else if (info->ChipFamily >= CHIP_FAMILY_R200) {
- req_minor = 5;
- req_patch = 0;
} else if (info->ChipFamily >= CHIP_FAMILY_R300) {
req_minor = 12;
req_patch = 0;
+ } else if (info->ChipFamily >= CHIP_FAMILY_R200) {
+ req_minor = 5;
+ req_patch = 0;
} else {
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
req_minor = 1;