diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-08-04 11:16:05 -0400 |
---|---|---|
committer | Alex Deucher <alexdeucher@gmail.com> | 2009-08-04 11:16:05 -0400 |
commit | fce31b61a88522733863a9b4e9f1c935c439cb4e (patch) | |
tree | cc5a63e12102aba4eedfe30bcdce2c388ad78aa5 | |
parent | 6b1b4b9214d58175727f7992fc42bc7244c42bf2 (diff) |
RS880: enable accel
-rw-r--r-- | src/pcidb/ati_pciids.csv | 10 | ||||
-rw-r--r-- | src/r600_exa.c | 3 | ||||
-rw-r--r-- | src/r600_textured_videofuncs.c | 1 | ||||
-rw-r--r-- | src/r6xx_accel.c | 2 | ||||
-rw-r--r-- | src/radeon_chipset_gen.h | 10 | ||||
-rw-r--r-- | src/radeon_driver.c | 3 |
6 files changed, 16 insertions, 13 deletions
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv index e730228b..695d9a65 100644 --- a/src/pcidb/ati_pciids.csv +++ b/src/pcidb/ati_pciids.csv @@ -451,6 +451,6 @@ "0x9616","RS780_9616","RS780",,1,,,1,"ATI Radeon 3000 Graphics" -"0x9710","RS880_9710","RS880",,1,,,1,"ATI Radeon HD Graphics" -"0x9711","RS880_9711","RS880",,1,,,1,"ATI Radeon Graphics" -"0x9712","RS880_9712","RS880",1,1,,,1,"ATI Mobility Radeon HD Graphics" -"0x9713","RS880_9713","RS880",1,1,,,1,"ATI Mobility Radeon Graphics" -"0x9714","RS880_9714","RS880",,1,,,1,"ATI Radeon Graphics" +"0x9710","RS880_9710","RS880",,1,,,1,"ATI Radeon HD 4200" +"0x9711","RS880_9711","RS880",,1,,,1,"ATI Radeon 4100" +"0x9712","RS880_9712","RS880",1,1,,,1,"ATI Mobility Radeon HD 4200" +"0x9713","RS880_9713","RS880",1,1,,,1,"ATI Mobility Radeon 4100" +"0x9714","RS880_9714","RS880",,1,,,1,"ATI RS880" diff --git a/src/r600_exa.c b/src/r600_exa.c index 485322dd..d8c4de8d 100644 --- a/src/r600_exa.c +++ b/src/r600_exa.c @@ -321,2 +321,3 @@ R600DoneSolid(PixmapPtr pPix) (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) @@ -563,2 +564,3 @@ R600DoCopy(ScrnInfoPtr pScrn) (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) @@ -1726,2 +1728,3 @@ static void R600DoneComposite(PixmapPtr pDst) (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c index 2f0b6b13..5e33191e 100644 --- a/src/r600_textured_videofuncs.c +++ b/src/r600_textured_videofuncs.c @@ -80,2 +80,3 @@ R600DoneTexturedVideo(ScrnInfoPtr pScrn) (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c index 6423e588..c47bdbb3 100644 --- a/src/r6xx_accel.c +++ b/src/r6xx_accel.c @@ -130,2 +130,3 @@ sq_setup(ScrnInfoPtr pScrn, drmBufPtr ib, sq_config_t *sq_conf) (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) @@ -664,2 +665,3 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib) case CHIP_FAMILY_RS780: + case CHIP_FAMILY_RS880: default: diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h index 12dc322c..fc41c3d2 100644 --- a/src/radeon_chipset_gen.h +++ b/src/radeon_chipset_gen.h @@ -370,7 +370,7 @@ static SymTabRec RADEONChipsets[] = { { PCI_CHIP_RS780_9616, "ATI Radeon 3000 Graphics" }, - { PCI_CHIP_RS880_9710, "ATI Radeon HD Graphics" }, - { PCI_CHIP_RS880_9711, "ATI Radeon Graphics" }, - { PCI_CHIP_RS880_9712, "ATI Mobility Radeon HD Graphics" }, - { PCI_CHIP_RS880_9713, "ATI Mobility Radeon Graphics" }, - { PCI_CHIP_RS880_9714, "ATI Radeon Graphics" }, + { PCI_CHIP_RS880_9710, "ATI Radeon HD 4200" }, + { PCI_CHIP_RS880_9711, "ATI Radeon 4100" }, + { PCI_CHIP_RS880_9712, "ATI Mobility Radeon HD 4200" }, + { PCI_CHIP_RS880_9713, "ATI Mobility Radeon 4100" }, + { PCI_CHIP_RS880_9714, "ATI RS880" }, { -1, NULL } diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 29c0b11a..e7660930 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2297,5 +2297,2 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) - if (info->ChipFamily == CHIP_FAMILY_RS880) - return FALSE; - if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, TRUE)) { |