xf86-video-amdgpu: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Wed May 13 06:19:18 PDT 2015
src/amdgpu_chipinfo_gen.h | 8 ++++++--
src/amdgpu_chipset_gen.h | 8 ++++++--
src/amdgpu_pci_chipset_gen.h | 8 ++++++--
src/amdgpu_pci_device_match_gen.h | 8 ++++++--
src/ati_pciids_gen.h | 8 ++++++--
src/pcidb/ati_pciids.csv | 8 ++++++--
6 files changed, 36 insertions(+), 12 deletions(-)
New commits:
commit 22917044e419023d487f816e0d4f094695b55fa6
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Tue May 12 13:29:00 2015 -0400
add some new tonga pci ids
Reviewed-by: Jammy Zhou <Jammy.Zhou at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index 04d3e2d..5d1b29b 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -65,10 +65,13 @@ static AMDGPUCardInfo AMDGPUCards[] = {
{ 0x6907, CHIP_FAMILY_TOPAZ },
{ 0x6920, CHIP_FAMILY_TONGA },
{ 0x6921, CHIP_FAMILY_TONGA },
- { 0x6938, CHIP_FAMILY_TONGA },
- { 0x6939, CHIP_FAMILY_TONGA },
+ { 0x6928, CHIP_FAMILY_TONGA },
+ { 0x6929, CHIP_FAMILY_TONGA },
{ 0x692B, CHIP_FAMILY_TONGA },
{ 0x692F, CHIP_FAMILY_TONGA },
+ { 0x6930, CHIP_FAMILY_TONGA },
+ { 0x6938, CHIP_FAMILY_TONGA },
+ { 0x6939, CHIP_FAMILY_TONGA },
{ 0x9870, CHIP_FAMILY_CARRIZO },
{ 0x9874, CHIP_FAMILY_CARRIZO },
{ 0x9875, CHIP_FAMILY_CARRIZO },
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index 82682d5..d17589b 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -65,10 +65,13 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_TOPAZ_6907, "TOPAZ" },
{ PCI_CHIP_TONGA_6920, "TONGA" },
{ PCI_CHIP_TONGA_6921, "TONGA" },
- { PCI_CHIP_TONGA_6938, "TONGA" },
- { PCI_CHIP_TONGA_6939, "TONGA" },
+ { PCI_CHIP_TONGA_6928, "TONGA" },
+ { PCI_CHIP_TONGA_6929, "TONGA" },
{ PCI_CHIP_TONGA_692B, "TONGA" },
{ PCI_CHIP_TONGA_692F, "TONGA" },
+ { PCI_CHIP_TONGA_6930, "TONGA" },
+ { PCI_CHIP_TONGA_6938, "TONGA" },
+ { PCI_CHIP_TONGA_6939, "TONGA" },
{ PCI_CHIP_CARRIZO_9870, "CARRIZO" },
{ PCI_CHIP_CARRIZO_9874, "CARRIZO" },
{ PCI_CHIP_CARRIZO_9875, "CARRIZO" },
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 3aa74e7..4d37f51 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -65,10 +65,13 @@ static PciChipsets AMDGPUPciChipsets[] = {
{ PCI_CHIP_TOPAZ_6907, PCI_CHIP_TOPAZ_6907, RES_SHARED_VGA },
{ PCI_CHIP_TONGA_6920, PCI_CHIP_TONGA_6920, RES_SHARED_VGA },
{ PCI_CHIP_TONGA_6921, PCI_CHIP_TONGA_6921, RES_SHARED_VGA },
- { PCI_CHIP_TONGA_6938, PCI_CHIP_TONGA_6938, RES_SHARED_VGA },
- { PCI_CHIP_TONGA_6939, PCI_CHIP_TONGA_6939, RES_SHARED_VGA },
+ { PCI_CHIP_TONGA_6928, PCI_CHIP_TONGA_6928, RES_SHARED_VGA },
+ { PCI_CHIP_TONGA_6929, PCI_CHIP_TONGA_6929, RES_SHARED_VGA },
{ PCI_CHIP_TONGA_692B, PCI_CHIP_TONGA_692B, RES_SHARED_VGA },
{ PCI_CHIP_TONGA_692F, PCI_CHIP_TONGA_692F, RES_SHARED_VGA },
+ { PCI_CHIP_TONGA_6930, PCI_CHIP_TONGA_6930, RES_SHARED_VGA },
+ { PCI_CHIP_TONGA_6938, PCI_CHIP_TONGA_6938, RES_SHARED_VGA },
+ { PCI_CHIP_TONGA_6939, PCI_CHIP_TONGA_6939, RES_SHARED_VGA },
{ PCI_CHIP_CARRIZO_9870, PCI_CHIP_CARRIZO_9870, RES_SHARED_VGA },
{ PCI_CHIP_CARRIZO_9874, PCI_CHIP_CARRIZO_9874, RES_SHARED_VGA },
{ PCI_CHIP_CARRIZO_9875, PCI_CHIP_CARRIZO_9875, RES_SHARED_VGA },
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index cac1d35..432059e 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -65,10 +65,13 @@ static const struct pci_id_match amdgpu_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_TOPAZ_6907, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6920, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6921, 0 ),
- ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6938, 0 ),
- ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6939, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6928, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6929, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TONGA_692B, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TONGA_692F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6930, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6938, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_TONGA_6939, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9870, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9874, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9875, 0 ),
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index aa936f6..a34246f 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -63,10 +63,13 @@
#define PCI_CHIP_TOPAZ_6907 0x6907
#define PCI_CHIP_TONGA_6920 0x6920
#define PCI_CHIP_TONGA_6921 0x6921
-#define PCI_CHIP_TONGA_6938 0x6938
-#define PCI_CHIP_TONGA_6939 0x6939
+#define PCI_CHIP_TONGA_6928 0x6928
+#define PCI_CHIP_TONGA_6929 0x6929
#define PCI_CHIP_TONGA_692B 0x692B
#define PCI_CHIP_TONGA_692F 0x692F
+#define PCI_CHIP_TONGA_6930 0x6930
+#define PCI_CHIP_TONGA_6938 0x6938
+#define PCI_CHIP_TONGA_6939 0x6939
#define PCI_CHIP_CARRIZO_9870 0x9870
#define PCI_CHIP_CARRIZO_9874 0x9874
#define PCI_CHIP_CARRIZO_9875 0x9875
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index cb15505..f9500da 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -64,10 +64,13 @@
"0x6907","TOPAZ_6907","TOPAZ","TOPAZ"
"0x6920","TONGA_6920","TONGA","TONGA"
"0x6921","TONGA_6921","TONGA","TONGA"
-"0x6938","TONGA_6938","TONGA","TONGA"
-"0x6939","TONGA_6939","TONGA","TONGA"
+"0x6928","TONGA_6928","TONGA","TONGA"
+"0x6929","TONGA_6929","TONGA","TONGA"
"0x692B","TONGA_692B","TONGA","TONGA"
"0x692F","TONGA_692F","TONGA","TONGA"
+"0x6930","TONGA_6930","TONGA","TONGA"
+"0x6938","TONGA_6938","TONGA","TONGA"
+"0x6939","TONGA_6939","TONGA","TONGA"
"0x9870","CARRIZO_9870","CARRIZO","CARRIZO"
"0x9874","CARRIZO_9874","CARRIZO","CARRIZO"
"0x9875","CARRIZO_9875","CARRIZO","CARRIZO"
commit e71be4a22799ec4c02051b75c5fed16a3a953c7b
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Tue May 12 13:25:02 2015 -0400
add new bonaire pci id
Reviewed-by: Jammy Zhou <Jammy.Zhou at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index ca28a98..04d3e2d 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -8,6 +8,7 @@ static AMDGPUCardInfo AMDGPUCards[] = {
{ 0x6658, CHIP_FAMILY_BONAIRE },
{ 0x665C, CHIP_FAMILY_BONAIRE },
{ 0x665D, CHIP_FAMILY_BONAIRE },
+ { 0x665F, CHIP_FAMILY_BONAIRE },
{ 0x9830, CHIP_FAMILY_KABINI },
{ 0x9831, CHIP_FAMILY_KABINI },
{ 0x9832, CHIP_FAMILY_KABINI },
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index 258ee22..82682d5 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -8,6 +8,7 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_BONAIRE_6658, "BONAIRE" },
{ PCI_CHIP_BONAIRE_665C, "BONAIRE" },
{ PCI_CHIP_BONAIRE_665D, "BONAIRE" },
+ { PCI_CHIP_BONAIRE_665F, "BONAIRE" },
{ PCI_CHIP_KABINI_9830, "KABINI" },
{ PCI_CHIP_KABINI_9831, "KABINI" },
{ PCI_CHIP_KABINI_9832, "KABINI" },
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 257a121..3aa74e7 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -8,6 +8,7 @@ static PciChipsets AMDGPUPciChipsets[] = {
{ PCI_CHIP_BONAIRE_6658, PCI_CHIP_BONAIRE_6658, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_665C, PCI_CHIP_BONAIRE_665C, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_665D, PCI_CHIP_BONAIRE_665D, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_665F, PCI_CHIP_BONAIRE_665F, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_9830, PCI_CHIP_KABINI_9830, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_9831, PCI_CHIP_KABINI_9831, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_9832, PCI_CHIP_KABINI_9832, RES_SHARED_VGA },
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index 1e9255f..cac1d35 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -8,6 +8,7 @@ static const struct pci_id_match amdgpu_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6658, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_665F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_9830, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_9831, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_9832, 0 ),
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 8c58736..aa936f6 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -6,6 +6,7 @@
#define PCI_CHIP_BONAIRE_6658 0x6658
#define PCI_CHIP_BONAIRE_665C 0x665C
#define PCI_CHIP_BONAIRE_665D 0x665D
+#define PCI_CHIP_BONAIRE_665F 0x665F
#define PCI_CHIP_KABINI_9830 0x9830
#define PCI_CHIP_KABINI_9831 0x9831
#define PCI_CHIP_KABINI_9832 0x9832
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index bac9b8f..cb15505 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -7,6 +7,7 @@
"0x6658","BONAIRE_6658","BONAIRE","BONAIRE"
"0x665C","BONAIRE_665C","BONAIRE","BONAIRE"
"0x665D","BONAIRE_665D","BONAIRE","BONAIRE"
+"0x665F","BONAIRE_665F","BONAIRE","BONAIRE"
"0x9830","KABINI_9830","KABINI","KABINI"
"0x9831","KABINI_9831","KABINI","KABINI"
"0x9832","KABINI_9832","KABINI","KABINI"
More information about the xorg-commit
mailing list