xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Sat Mar 21 22:33:40 PDT 2009
src/ati_pciids_gen.h | 5 +++++
src/pcidb/ati_pciids.csv | 7 ++++++-
src/radeon.h | 1 +
src/radeon_atombios.c | 2 +-
src/radeon_chipinfo_gen.h | 5 +++++
src/radeon_chipset_gen.h | 7 ++++++-
src/radeon_driver.c | 5 ++++-
src/radeon_pci_chipset_gen.h | 5 +++++
src/radeon_pci_device_match_gen.h | 5 +++++
9 files changed, 38 insertions(+), 4 deletions(-)
New commits:
commit 2fe6b393d9dbb193d4f0a3351ad76618cda07e2c
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Sun Mar 22 01:31:30 2009 -0400
radeon: add new chip ids
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 8aad4be..f31cadb 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 e027c65..bff80ca 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 7bb720a..a8acf9a 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 0b17cbd..47f5103 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 97b601f..e36828c 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 bc5bd1a..caa497a 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 5a15c70..fffb924 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 7749ea7..b9368d7 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 83f15a7..3923371 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 }
};
More information about the xorg-commit
mailing list