xf86-video-ati: Branch '6.12-branch'

[Alex Deucher]

 src/pcidb/ati_pciids.csv       |   10 +++++-----
 src/r600_exa.c                 |    3 +++
 src/r600_textured_videofuncs.c |    1 +
 src/r6xx_accel.c               |    2 ++
 src/radeon_chipset_gen.h       |   10 +++++-----
 src/radeon_driver.c            |    3 ---
 6 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 9a6cf3c145e1a42f50f8f1a85a4bea5ceeb98578
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Aug 4 11:16:05 2009 -0400

    RS880: enable accel

diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e730228..695d9a6 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 2dc33a8..9b80ed2 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -315,6 +315,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);
@@ -553,6 +554,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);
@@ -1715,6 +1717,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 88745d5..c0210a7 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -69,6 +69,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 65834bf..b6d09ce 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -197,6 +197,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
@@ -738,6 +739,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 12dc322..fc41c3d 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 2321fe2..056ff29 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2233,9 +2233,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");