diff options
Diffstat (limited to 'src')
| -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 @@ -449,8 +449,8 @@ "0x9614","RS780_9614","RS780",,1,,,1,"ATI Radeon HD 3300 Graphics" "0x9615","RS780_9615","RS780",,1,,,1,"ATI Radeon HD 3200 Graphics" "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 @@ -319,6 +319,7 @@ R600DoneSolid(PixmapPtr pPix) if ((info->ChipFamily == CHIP_FAMILY_RV610) || (info->ChipFamily == CHIP_FAMILY_RV620) || (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) cp_set_surface_sync(pScrn, accel_state->ib, TC_ACTION_ENA_bit, accel_state->vb_size, accel_state->vb_mc_addr); @@ -561,6 +562,7 @@ R600DoCopy(ScrnInfoPtr pScrn) if ((info->ChipFamily == CHIP_FAMILY_RV610) || (info->ChipFamily == CHIP_FAMILY_RV620) || (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) cp_set_surface_sync(pScrn, accel_state->ib, TC_ACTION_ENA_bit, accel_state->vb_size, accel_state->vb_mc_addr); @@ -1724,6 +1726,7 @@ static void R600DoneComposite(PixmapPtr pDst) if ((info->ChipFamily == CHIP_FAMILY_RV610) || (info->ChipFamily == CHIP_FAMILY_RV620) || (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) cp_set_surface_sync(pScrn, accel_state->ib, TC_ACTION_ENA_bit, accel_state->vb_size, accel_state->vb_mc_addr); 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 @@ -78,6 +78,7 @@ R600DoneTexturedVideo(ScrnInfoPtr pScrn) if ((info->ChipFamily == CHIP_FAMILY_RV610) || (info->ChipFamily == CHIP_FAMILY_RV620) || (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) cp_set_surface_sync(pScrn, accel_state->ib, TC_ACTION_ENA_bit, accel_state->vb_size, accel_state->vb_mc_addr); 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 @@ -128,6 +128,7 @@ sq_setup(ScrnInfoPtr pScrn, drmBufPtr ib, sq_config_t *sq_conf) if ((info->ChipFamily == CHIP_FAMILY_RV610) || (info->ChipFamily == CHIP_FAMILY_RV620) || (info->ChipFamily == CHIP_FAMILY_RS780) || + (info->ChipFamily == CHIP_FAMILY_RS880) || (info->ChipFamily == CHIP_FAMILY_RV710)) sq_config = 0; // no VC else @@ -662,6 +663,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib) case CHIP_FAMILY_RV610: case CHIP_FAMILY_RV620: case CHIP_FAMILY_RS780: + case CHIP_FAMILY_RS880: default: sq_conf.num_ps_gprs = 84; sq_conf.num_vs_gprs = 36; 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 @@ -368,10 +368,10 @@ static SymTabRec RADEONChipsets[] = { { PCI_CHIP_RS780_9614, "ATI Radeon HD 3300 Graphics" }, { PCI_CHIP_RS780_9615, "ATI Radeon HD 3200 Graphics" }, { 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 @@ -2295,9 +2295,6 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) } } - if (info->ChipFamily == CHIP_FAMILY_RS880) - return FALSE; - if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, TRUE)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering forced off\n"); |