xf86-video-ati: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Mon Feb 4 13:00:13 PST 2013
man/radeon.man | 2 ++
src/ati_pciids_gen.h | 13 +++++++++++++
src/pcidb/ati_pciids.csv | 13 +++++++++++++
src/radeon_chipinfo_gen.h | 13 +++++++++++++
src/radeon_chipset_gen.h | 13 +++++++++++++
src/radeon_pci_chipset_gen.h | 13 +++++++++++++
src/radeon_pci_device_match_gen.h | 13 +++++++++++++
src/radeon_probe.h | 1 +
8 files changed, 81 insertions(+)
New commits:
commit 343b01c9bf35b125cd0c3df8db7c01a5fb227bda
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Jan 24 19:57:23 2013 -0500
radeon/kms: add oland pci ids
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index eab9772..18dd469 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -663,3 +663,16 @@
#define PCI_CHIP_VERDE_683B 0x683B
#define PCI_CHIP_VERDE_683D 0x683D
#define PCI_CHIP_VERDE_683F 0x683F
+#define PCI_CHIP_OLAND_6600 0x6600
+#define PCI_CHIP_OLAND_6601 0x6601
+#define PCI_CHIP_OLAND_6602 0x6602
+#define PCI_CHIP_OLAND_6603 0x6603
+#define PCI_CHIP_OLAND_6606 0x6606
+#define PCI_CHIP_OLAND_6607 0x6607
+#define PCI_CHIP_OLAND_6610 0x6610
+#define PCI_CHIP_OLAND_6611 0x6611
+#define PCI_CHIP_OLAND_6613 0x6613
+#define PCI_CHIP_OLAND_6620 0x6620
+#define PCI_CHIP_OLAND_6621 0x6621
+#define PCI_CHIP_OLAND_6623 0x6623
+#define PCI_CHIP_OLAND_6631 0x6631
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index c9987fe..27bcdeb 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -664,3 +664,16 @@
"0x683B","VERDE_683B","VERDE",,,,,,"VERDE"
"0x683D","VERDE_683D","VERDE",,,,,,"VERDE"
"0x683F","VERDE_683F","VERDE",,,,,,"VERDE"
+"0x6600","OLAND_6600","OLAND",1,,,,,"OLAND"
+"0x6601","OLAND_6601","OLAND",1,,,,,"OLAND"
+"0x6602","OLAND_6602","OLAND",1,,,,,"OLAND"
+"0x6603","OLAND_6603","OLAND",1,,,,,"OLAND"
+"0x6606","OLAND_6606","OLAND",1,,,,,"OLAND"
+"0x6607","OLAND_6607","OLAND",1,,,,,"OLAND"
+"0x6610","OLAND_6610","OLAND",,,,,,"OLAND"
+"0x6611","OLAND_6611","OLAND",,,,,,"OLAND"
+"0x6613","OLAND_6613","OLAND",,,,,,"OLAND"
+"0x6620","OLAND_6620","OLAND",1,,,,,"OLAND"
+"0x6621","OLAND_6621","OLAND",1,,,,,"OLAND"
+"0x6623","OLAND_6623","OLAND",1,,,,,"OLAND"
+"0x6631","OLAND_6631","OLAND",,,,,,"OLAND"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 665b8d3..3e2896a 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -583,4 +583,17 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x683B, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x683D, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x683F, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
+ { 0x6600, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6601, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6602, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6603, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6606, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6607, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6610, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
+ { 0x6611, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
+ { 0x6613, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
+ { 0x6620, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6621, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6623, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6631, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
};
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 3a27416..e5ce104 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -583,5 +583,18 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_VERDE_683B, "VERDE" },
{ PCI_CHIP_VERDE_683D, "VERDE" },
{ PCI_CHIP_VERDE_683F, "VERDE" },
+ { PCI_CHIP_OLAND_6600, "OLAND" },
+ { PCI_CHIP_OLAND_6601, "OLAND" },
+ { PCI_CHIP_OLAND_6602, "OLAND" },
+ { PCI_CHIP_OLAND_6603, "OLAND" },
+ { PCI_CHIP_OLAND_6606, "OLAND" },
+ { PCI_CHIP_OLAND_6607, "OLAND" },
+ { PCI_CHIP_OLAND_6610, "OLAND" },
+ { PCI_CHIP_OLAND_6611, "OLAND" },
+ { PCI_CHIP_OLAND_6613, "OLAND" },
+ { PCI_CHIP_OLAND_6620, "OLAND" },
+ { PCI_CHIP_OLAND_6621, "OLAND" },
+ { PCI_CHIP_OLAND_6623, "OLAND" },
+ { PCI_CHIP_OLAND_6631, "OLAND" },
{ -1, NULL }
};
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index bb73901..527b1bf 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -583,5 +583,18 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_VERDE_683B, PCI_CHIP_VERDE_683B, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_683D, PCI_CHIP_VERDE_683D, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_683F, PCI_CHIP_VERDE_683F, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6600, PCI_CHIP_OLAND_6600, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6601, PCI_CHIP_OLAND_6601, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6602, PCI_CHIP_OLAND_6602, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6603, PCI_CHIP_OLAND_6603, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6606, PCI_CHIP_OLAND_6606, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6607, PCI_CHIP_OLAND_6607, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6610, PCI_CHIP_OLAND_6610, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6611, PCI_CHIP_OLAND_6611, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6613, PCI_CHIP_OLAND_6613, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6620, PCI_CHIP_OLAND_6620, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6621, PCI_CHIP_OLAND_6621, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6623, PCI_CHIP_OLAND_6623, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6631, PCI_CHIP_OLAND_6631, 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 3c415da..5f26d8d 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -583,5 +583,18 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_683B, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_683D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_683F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6600, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6601, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6602, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6603, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6606, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6607, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6610, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6611, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6613, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6620, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6621, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6623, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6631, 0 ),
{ 0, 0, 0 }
};
commit 9980f1e0e0a5df5fb0c791687e5c98c13089d7d1
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Jan 24 19:52:04 2013 -0500
radeon: add oland chip family
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/man/radeon.man b/man/radeon.man
index 4e19fde..7de370a 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -186,6 +186,8 @@ Radeon HD 6950/6970/6990
.B PITCAIRN
.TP 12
.B VERDE
+.TP 12
+.B OLAND
.PD
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 07bc080..516b7b4 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -105,6 +105,7 @@ typedef enum {
CHIP_FAMILY_TAHITI,
CHIP_FAMILY_PITCAIRN,
CHIP_FAMILY_VERDE,
+ CHIP_FAMILY_OLAND,
CHIP_FAMILY_LAST
} RADEONChipFamily;
More information about the xorg-commit
mailing list