radeon: add new chip ids

9 files changed, 38 insertions, 4 deletions

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 8aad4bed..f31cadb7 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -431,3 +431,8 @@
 #define PCI_CHIP_RS780_9614 0x9614
 #define PCI_CHIP_RS780_9615 0x9615
 #define PCI_CHIP_RS780_9616 0x9616
+#define PCI_CHIP_RS880_9710 0x9710
+#define PCI_CHIP_RS880_9711 0x9711
+#define PCI_CHIP_RS880_9712 0x9712
+#define PCI_CHIP_RS880_9713 0x9713
+#define PCI_CHIP_RS880_9714 0x9714
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e027c652..bff80cab 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -431,4 +431,9 @@
 "0x9613","RS780_9613","RS780",,1,,,1,"ATI Radeon 3100 Graphics"
 "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 HD 3000 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"
diff --git a/src/radeon.h b/src/radeon.h
index 7bb720a0..a8acf9a7 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -325,6 +325,7 @@ typedef enum {
     CHIP_FAMILY_RV620,
     CHIP_FAMILY_RV635,
     CHIP_FAMILY_RS780,
+    CHIP_FAMILY_RS880,
     CHIP_FAMILY_RV770,
     CHIP_FAMILY_RV730,
     CHIP_FAMILY_RV710,
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 0b17cbd2..47f51030 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1784,7 +1784,7 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 		continue;
 	    }
 
-	    if ((info->ChipFamily == CHIP_FAMILY_RS780) &&
+	    if (info->IsIGP &&
 		(con_obj_id == CONNECTOR_OBJECT_ID_PCIE_CONNECTOR)) {
 		uint32_t slot_config, ct;
 
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 97b601fd..e36828c6 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -351,4 +351,9 @@ RADEONCardInfo RADEONCards[] = {
  { 0x9614, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
  { 0x9615, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
  { 0x9616, CHIP_FAMILY_RS780, 0, 1, 0, 0, 1 },
+ { 0x9710, CHIP_FAMILY_RS880, 0, 1, 0, 0, 1 },
+ { 0x9711, CHIP_FAMILY_RS880, 0, 1, 0, 0, 1 },
+ { 0x9712, CHIP_FAMILY_RS880, 1, 1, 0, 0, 1 },
+ { 0x9713, CHIP_FAMILY_RS880, 1, 1, 0, 0, 1 },
+ { 0x9714, CHIP_FAMILY_RS880, 0, 1, 0, 0, 1 },
 };
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index bc5bd1a8..caa497a3 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -350,6 +350,11 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RS780_9613, "ATI Radeon 3100 Graphics" },
   { PCI_CHIP_RS780_9614, "ATI Radeon HD 3300 Graphics" },
   { PCI_CHIP_RS780_9615, "ATI Radeon HD 3200 Graphics" },
-  { PCI_CHIP_RS780_9616, "ATI Radeon HD 3000 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" },
   { -1,                 NULL }
 };
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 5a15c70d..fffb924d 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1333,7 +1333,8 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
     if ((info->ChipFamily != CHIP_FAMILY_RS600) &&
 	(info->ChipFamily != CHIP_FAMILY_RS690) &&
 	(info->ChipFamily != CHIP_FAMILY_RS740) &&
-	(info->ChipFamily != CHIP_FAMILY_RS780)) {
+	(info->ChipFamily != CHIP_FAMILY_RS780) &&
+	(info->ChipFamily != CHIP_FAMILY_RS880)) {
 	if (info->IsIGP)
 	    info->mc_fb_location = INREG(RADEON_NB_TOM);
 	else
@@ -2204,6 +2205,8 @@ 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,
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 7749ea7d..b9368d75 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -351,5 +351,10 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_RS780_9614, PCI_CHIP_RS780_9614, RES_SHARED_VGA },
  { PCI_CHIP_RS780_9615, PCI_CHIP_RS780_9615, RES_SHARED_VGA },
  { PCI_CHIP_RS780_9616, PCI_CHIP_RS780_9616, RES_SHARED_VGA },
+ { PCI_CHIP_RS880_9710, PCI_CHIP_RS880_9710, RES_SHARED_VGA },
+ { PCI_CHIP_RS880_9711, PCI_CHIP_RS880_9711, RES_SHARED_VGA },
+ { PCI_CHIP_RS880_9712, PCI_CHIP_RS880_9712, RES_SHARED_VGA },
+ { PCI_CHIP_RS880_9713, PCI_CHIP_RS880_9713, RES_SHARED_VGA },
+ { PCI_CHIP_RS880_9714, PCI_CHIP_RS880_9714, RES_SHARED_VGA },
  { -1,                 -1,                 RES_UNDEFINED }
 };
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 83f15a7b..39233718 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -351,5 +351,10 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_RS780_9614, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS780_9615, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RS780_9616, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS880_9710, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS880_9711, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS880_9712, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS880_9713, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RS880_9714, 0 ),
  { 0, 0, 0 }
 };