From 3e48e6fce4861febd24d8d1008df66ae1b87c8ad Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 11 Mar 2003 10:26:57 +0000 Subject: [PATCH] Add r200 chipids (Jon Smirl) -- for real this time --- .../drivers/dri/radeon/server/radeon_dri.c | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.c b/src/mesa/drivers/dri/radeon/server/radeon_dri.c index 3c2d029ca90..d8702f41e61 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_dri.c +++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.c @@ -879,6 +879,14 @@ static int get_chipfamily_from_chipset( RADEONInfoPtr info ) info->ChipFamily = CHIP_FAMILY_VE; break; + case PCI_CHIP_R200_QL: + case PCI_CHIP_R200_QN: + case PCI_CHIP_R200_QO: + case PCI_CHIP_R200_Ql: + case PCI_CHIP_R200_BB: + info->ChipFamily = CHIP_FAMILY_R200; + break; + case PCI_CHIP_RV200_QW: /* RV200 desktop */ case PCI_CHIP_RV200_QX: info->ChipFamily = CHIP_FAMILY_RV200; @@ -889,35 +897,30 @@ static int get_chipfamily_from_chipset( RADEONInfoPtr info ) info->ChipFamily = CHIP_FAMILY_M7; break; - case PCI_CHIP_RADEON_QD: - case PCI_CHIP_RADEON_QE: - case PCI_CHIP_RADEON_QF: - case PCI_CHIP_RADEON_QG: - /* Original Radeon/7200 */ - info->ChipFamily = CHIP_FAMILY_RADEON; + case PCI_CHIP_RV250_Id: + case PCI_CHIP_RV250_Ie: + case PCI_CHIP_RV250_If: + case PCI_CHIP_RV250_Ig: + info->ChipFamily = CHIP_FAMILY_RV250; break; - case PCI_CHIP_R200_QL: - case PCI_CHIP_R200_QN: - case PCI_CHIP_R200_QO: - case PCI_CHIP_R200_Ql: /* r200 */ - return 0; - case PCI_CHIP_RV250_Ld: case PCI_CHIP_RV250_Le: case PCI_CHIP_RV250_Lf: - case PCI_CHIP_RV250_Lg: /* m9 */ - return 0; + case PCI_CHIP_RV250_Lg: + info->ChipFamily = CHIP_FAMILY_M9; + break; case PCI_CHIP_R300_ND: case PCI_CHIP_R300_NE: case PCI_CHIP_R300_NF: - case PCI_CHIP_R300_NG: /* r300 */ - return 0; - + case PCI_CHIP_R300_NG: + info->ChipFamily = CHIP_FAMILY_R300; + break; default: - return 0; + /* Original Radeon/7200 */ + info->ChipFamily = CHIP_FAMILY_RADEON; } return 1;