xf86-video-amdgpu: Branch 'master' - 3 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Fri Mar 25 02:45:56 UTC 2016
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/amdgpu_probe.h | 2 ++
src/ati_pciids_gen.h | 8 ++++++++
src/pcidb/ati_pciids.csv | 8 ++++++++
7 files changed, 50 insertions(+)
New commits:
commit e31a2d668a1b5ebaf75d423c8123cbc8e0dcbae9
Author: Flora Cui <Flora.Cui at amd.com>
Date: Wed Nov 18 16:44:13 2015 +0800
add polaris10 pci id
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Flora Cui <Flora.Cui at amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou at amd.com>
diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index df8d717..4a0f6b8 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -85,4 +85,6 @@ static AMDGPUCardInfo AMDGPUCards[] = {
{ 0x67E9, CHIP_FAMILY_POLARIS11 },
{ 0x67EB, CHIP_FAMILY_POLARIS11 },
{ 0x67FF, CHIP_FAMILY_POLARIS11 },
+ { 0x67C0, CHIP_FAMILY_POLARIS10 },
+ { 0x67DF, CHIP_FAMILY_POLARIS10 },
};
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index fe7c7a8..1be967c 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -85,5 +85,7 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_POLARIS11_67E9, "POLARIS11" },
{ PCI_CHIP_POLARIS11_67EB, "POLARIS11" },
{ PCI_CHIP_POLARIS11_67FF, "POLARIS11" },
+ { PCI_CHIP_POLARIS10_67C0, "POLARIS10" },
+ { PCI_CHIP_POLARIS10_67DF, "POLARIS10" },
{ -1, NULL }
};
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 3fa9a47..9ed8faf 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -85,5 +85,7 @@ static PciChipsets AMDGPUPciChipsets[] = {
{ PCI_CHIP_POLARIS11_67E9, PCI_CHIP_POLARIS11_67E9, RES_SHARED_VGA },
{ PCI_CHIP_POLARIS11_67EB, PCI_CHIP_POLARIS11_67EB, RES_SHARED_VGA },
{ PCI_CHIP_POLARIS11_67FF, PCI_CHIP_POLARIS11_67FF, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS10_67C0, PCI_CHIP_POLARIS10_67C0, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS10_67DF, PCI_CHIP_POLARIS10_67DF, RES_SHARED_VGA },
{ -1, -1, RES_UNDEFINED }
};
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index 5021d99..dd2c0cd 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -85,5 +85,7 @@ static const struct pci_id_match amdgpu_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67E9, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67EB, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67FF, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS10_67C0, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS10_67DF, 0 ),
{ 0, 0, 0 }
};
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 86a8e19..a949118 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -83,3 +83,5 @@
#define PCI_CHIP_POLARIS11_67E9 0x67E9
#define PCI_CHIP_POLARIS11_67EB 0x67EB
#define PCI_CHIP_POLARIS11_67FF 0x67FF
+#define PCI_CHIP_POLARIS10_67C0 0x67C0
+#define PCI_CHIP_POLARIS10_67DF 0x67DF
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 55e5cda..7620aa3 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -84,3 +84,5 @@
"0x67E9","POLARIS11_67E9","POLARIS11","POLARIS11"
"0x67EB","POLARIS11_67EB","POLARIS11","POLARIS11"
"0x67FF","POLARIS11_67FF","POLARIS11","POLARIS11"
+"0x67C0","POLARIS10_67C0","POLARIS10","POLARIS10"
+"0x67DF","POLARIS10_67DF","POLARIS10","POLARIS10"
commit 6e09b8deb77f76b9bb7d393cc1ad924ebba62eff
Author: Flora Cui <Flora.Cui at amd.com>
Date: Thu Nov 5 14:16:39 2015 +0800
add polaris11 pci id
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Flora Cui <Flora.Cui at amd.com>
Reviewed-By: Jammy Zhou <Jammy.Zhou at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index dab8746..df8d717 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -79,4 +79,10 @@ static AMDGPUCardInfo AMDGPUCards[] = {
{ 0x9877, CHIP_FAMILY_CARRIZO },
{ 0x7300, CHIP_FAMILY_FIJI },
{ 0x98E4, CHIP_FAMILY_STONEY },
+ { 0x67E0, CHIP_FAMILY_POLARIS11 },
+ { 0x67E1, CHIP_FAMILY_POLARIS11 },
+ { 0x67E8, CHIP_FAMILY_POLARIS11 },
+ { 0x67E9, CHIP_FAMILY_POLARIS11 },
+ { 0x67EB, CHIP_FAMILY_POLARIS11 },
+ { 0x67FF, CHIP_FAMILY_POLARIS11 },
};
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index a8683e0..fe7c7a8 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -79,5 +79,11 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_CARRIZO_9877, "CARRIZO" },
{ PCI_CHIP_FIJI_7300, "FIJI" },
{ PCI_CHIP_STONEY_98E4, "STONEY" },
+ { PCI_CHIP_POLARIS11_67E0, "POLARIS11" },
+ { PCI_CHIP_POLARIS11_67E1, "POLARIS11" },
+ { PCI_CHIP_POLARIS11_67E8, "POLARIS11" },
+ { PCI_CHIP_POLARIS11_67E9, "POLARIS11" },
+ { PCI_CHIP_POLARIS11_67EB, "POLARIS11" },
+ { PCI_CHIP_POLARIS11_67FF, "POLARIS11" },
{ -1, NULL }
};
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index fc16b62..3fa9a47 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -79,5 +79,11 @@ static PciChipsets AMDGPUPciChipsets[] = {
{ PCI_CHIP_CARRIZO_9877, PCI_CHIP_CARRIZO_9877, RES_SHARED_VGA },
{ PCI_CHIP_FIJI_7300, PCI_CHIP_FIJI_7300, RES_SHARED_VGA },
{ PCI_CHIP_STONEY_98E4, PCI_CHIP_STONEY_98E4, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS11_67E0, PCI_CHIP_POLARIS11_67E0, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS11_67E1, PCI_CHIP_POLARIS11_67E1, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS11_67E8, PCI_CHIP_POLARIS11_67E8, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS11_67E9, PCI_CHIP_POLARIS11_67E9, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS11_67EB, PCI_CHIP_POLARIS11_67EB, RES_SHARED_VGA },
+ { PCI_CHIP_POLARIS11_67FF, PCI_CHIP_POLARIS11_67FF, RES_SHARED_VGA },
{ -1, -1, RES_UNDEFINED }
};
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index 1c00759..5021d99 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -79,5 +79,11 @@ static const struct pci_id_match amdgpu_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9877, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_FIJI_7300, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_STONEY_98E4, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67E0, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67E1, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67E8, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67E9, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67EB, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_POLARIS11_67FF, 0 ),
{ 0, 0, 0 }
};
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 76d161c..86a8e19 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -77,3 +77,9 @@
#define PCI_CHIP_CARRIZO_9877 0x9877
#define PCI_CHIP_FIJI_7300 0x7300
#define PCI_CHIP_STONEY_98E4 0x98E4
+#define PCI_CHIP_POLARIS11_67E0 0x67E0
+#define PCI_CHIP_POLARIS11_67E1 0x67E1
+#define PCI_CHIP_POLARIS11_67E8 0x67E8
+#define PCI_CHIP_POLARIS11_67E9 0x67E9
+#define PCI_CHIP_POLARIS11_67EB 0x67EB
+#define PCI_CHIP_POLARIS11_67FF 0x67FF
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 21de3a9..55e5cda 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -78,3 +78,9 @@
"0x9877","CARRIZO_9877","CARRIZO","CARRIZO"
"0x7300","FIJI_7300","FIJI","FIJI"
"0x98E4","STONEY_98E4","STONEY","STONEY"
+"0x67E0","POLARIS11_67E0","POLARIS11","POLARIS11"
+"0x67E1","POLARIS11_67E1","POLARIS11","POLARIS11"
+"0x67E8","POLARIS11_67E8","POLARIS11","POLARIS11"
+"0x67E9","POLARIS11_67E9","POLARIS11","POLARIS11"
+"0x67EB","POLARIS11_67EB","POLARIS11","POLARIS11"
+"0x67FF","POLARIS11_67FF","POLARIS11","POLARIS11"
commit 7d32c43fff4c8df32cce150223094f793e036cf3
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Wed Oct 28 17:28:23 2015 -0400
add Polaris chip families
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_probe.h b/src/amdgpu_probe.h
index 6edd4a1..865c197 100644
--- a/src/amdgpu_probe.h
+++ b/src/amdgpu_probe.h
@@ -67,6 +67,8 @@ typedef enum {
CHIP_FAMILY_CARRIZO,
CHIP_FAMILY_FIJI,
CHIP_FAMILY_STONEY,
+ CHIP_FAMILY_POLARIS10,
+ CHIP_FAMILY_POLARIS11,
CHIP_FAMILY_LAST
} AMDGPUChipFamily;
More information about the xorg-commit
mailing list