xf86-video-ati: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Mon May 13 14:08:30 PDT 2013
man/radeon.man | 2 ++
src/ati_pciids_gen.h | 6 ++++++
src/pcidb/ati_pciids.csv | 6 ++++++
src/radeon_chipinfo_gen.h | 6 ++++++
src/radeon_chipset_gen.h | 6 ++++++
src/radeon_pci_chipset_gen.h | 6 ++++++
src/radeon_pci_device_match_gen.h | 6 ++++++
src/radeon_probe.h | 1 +
8 files changed, 39 insertions(+)
New commits:
commit 0a84f2760eccf07781ae6c3f55d2d246c155c9ce
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Mon May 13 17:06:00 2013 -0400
radeon: add Hainan 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 cbc4b13..78523c5 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -692,3 +692,9 @@
#define PCI_CHIP_OLAND_6621 0x6621
#define PCI_CHIP_OLAND_6623 0x6623
#define PCI_CHIP_OLAND_6631 0x6631
+#define PCI_CHIP_HAINAN_6660 0x6660
+#define PCI_CHIP_HAINAN_6663 0x6663
+#define PCI_CHIP_HAINAN_6664 0x6664
+#define PCI_CHIP_HAINAN_6665 0x6665
+#define PCI_CHIP_HAINAN_6667 0x6667
+#define PCI_CHIP_HAINAN_666F 0x666F
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 2e0dc84..4de5d28 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -693,3 +693,9 @@
"0x6621","OLAND_6621","OLAND",1,,,,,"OLAND"
"0x6623","OLAND_6623","OLAND",1,,,,,"OLAND"
"0x6631","OLAND_6631","OLAND",,,,,,"OLAND"
+"0x6660","HAINAN_6660","HAINAN",1,,,,,"HAINAN"
+"0x6663","HAINAN_6663","HAINAN",1,,,,,"HAINAN"
+"0x6664","HAINAN_6664","HAINAN",1,,,,,"HAINAN"
+"0x6665","HAINAN_6665","HAINAN",1,,,,,"HAINAN"
+"0x6667","HAINAN_6667","HAINAN",1,,,,,"HAINAN"
+"0x666F","HAINAN_666F","HAINAN",1,,,,,"HAINAN"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 4bcd139..687f256 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -612,4 +612,10 @@ static RADEONCardInfo RADEONCards[] = {
{ 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 },
+ { 0x6660, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
+ { 0x6663, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
+ { 0x6664, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
+ { 0x6665, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
+ { 0x6667, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
+ { 0x666F, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
};
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index bebdd88..2ae7cc9 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -612,5 +612,11 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_OLAND_6621, "OLAND" },
{ PCI_CHIP_OLAND_6623, "OLAND" },
{ PCI_CHIP_OLAND_6631, "OLAND" },
+ { PCI_CHIP_HAINAN_6660, "HAINAN" },
+ { PCI_CHIP_HAINAN_6663, "HAINAN" },
+ { PCI_CHIP_HAINAN_6664, "HAINAN" },
+ { PCI_CHIP_HAINAN_6665, "HAINAN" },
+ { PCI_CHIP_HAINAN_6667, "HAINAN" },
+ { PCI_CHIP_HAINAN_666F, "HAINAN" },
{ -1, NULL }
};
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index ed37782..29c23b2 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -612,5 +612,11 @@ static PciChipsets RADEONPciChipsets[] = {
{ 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 },
+ { PCI_CHIP_HAINAN_6660, PCI_CHIP_HAINAN_6660, RES_SHARED_VGA },
+ { PCI_CHIP_HAINAN_6663, PCI_CHIP_HAINAN_6663, RES_SHARED_VGA },
+ { PCI_CHIP_HAINAN_6664, PCI_CHIP_HAINAN_6664, RES_SHARED_VGA },
+ { PCI_CHIP_HAINAN_6665, PCI_CHIP_HAINAN_6665, RES_SHARED_VGA },
+ { PCI_CHIP_HAINAN_6667, PCI_CHIP_HAINAN_6667, RES_SHARED_VGA },
+ { PCI_CHIP_HAINAN_666F, PCI_CHIP_HAINAN_666F, 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 46a8428..9b669fd 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -612,5 +612,11 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6621, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6623, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6631, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6660, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6663, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6664, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6665, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_6667, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_666F, 0 ),
{ 0, 0, 0 }
};
commit 6cee1eaebfcef2b2d2c51ec30c31260fd98b564e
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Mon May 13 17:01:30 2013 -0400
radeon: add hainan chip family
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/man/radeon.man b/man/radeon.man
index 5462e5b..e608b1e 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -188,6 +188,8 @@ Radeon HD 6950/6970/6990
.B VERDE
.TP 12
.B OLAND
+.TP 12
+.B HAINAN
.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 1899a16..ea5569a 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -106,6 +106,7 @@ typedef enum {
CHIP_FAMILY_PITCAIRN,
CHIP_FAMILY_VERDE,
CHIP_FAMILY_OLAND,
+ CHIP_FAMILY_HAINAN,
CHIP_FAMILY_LAST
} RADEONChipFamily;
More information about the xorg-commit
mailing list