xf86-video-amdgpu: Branch 'master' - 2 commits

[Alex Deucher]

 src/amdgpu_chipinfo_gen.h         |    1 +
 src/amdgpu_chipset_gen.h          |    1 +
 src/amdgpu_pci_chipset_gen.h      |    1 +
 src/amdgpu_pci_device_match_gen.h |    1 +
 src/amdgpu_probe.h                |    1 +
 src/ati_pciids_gen.h              |    1 +
 src/pcidb/ati_pciids.csv          |    1 +
 7 files changed, 7 insertions(+)

New commits:
commit c9611a2aa0f8d3bb55c552353740d60f6e4f63a0
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Tue Jul 7 22:46:34 2015 -0400

    add fiji pci id
    
    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 5d1b29b..6969e1e 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -77,4 +77,5 @@ static AMDGPUCardInfo AMDGPUCards[] = {
  { 0x9875, CHIP_FAMILY_CARRIZO },
  { 0x9876, CHIP_FAMILY_CARRIZO },
  { 0x9877, CHIP_FAMILY_CARRIZO },
+ { 0x7300, CHIP_FAMILY_FIJI },
 };
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index d17589b..94d2df5 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -77,5 +77,6 @@ SymTabRec AMDGPUChipsets[] = {
   { PCI_CHIP_CARRIZO_9875, "CARRIZO" },
   { PCI_CHIP_CARRIZO_9876, "CARRIZO" },
   { PCI_CHIP_CARRIZO_9877, "CARRIZO" },
+  { PCI_CHIP_FIJI_7300, "FIJI" },
   { -1,                 NULL }
 };
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 4d37f51..6ffb7db 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -77,5 +77,6 @@ static PciChipsets AMDGPUPciChipsets[] = {
  { PCI_CHIP_CARRIZO_9875, PCI_CHIP_CARRIZO_9875, RES_SHARED_VGA },
  { PCI_CHIP_CARRIZO_9876, PCI_CHIP_CARRIZO_9876, RES_SHARED_VGA },
  { PCI_CHIP_CARRIZO_9877, PCI_CHIP_CARRIZO_9877, RES_SHARED_VGA },
+ { PCI_CHIP_FIJI_7300, PCI_CHIP_FIJI_7300, 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 432059e..4a198ac 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -77,5 +77,6 @@ static const struct pci_id_match amdgpu_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9875, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9876, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CARRIZO_9877, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_FIJI_7300, 0 ),
  { 0, 0, 0 }
 };
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index a34246f..933d727 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -75,3 +75,4 @@
 #define PCI_CHIP_CARRIZO_9875 0x9875
 #define PCI_CHIP_CARRIZO_9876 0x9876
 #define PCI_CHIP_CARRIZO_9877 0x9877
+#define PCI_CHIP_FIJI_7300 0x7300
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index f9500da..0f18611 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -76,3 +76,4 @@
 "0x9875","CARRIZO_9875","CARRIZO","CARRIZO"
 "0x9876","CARRIZO_9876","CARRIZO","CARRIZO"
 "0x9877","CARRIZO_9877","CARRIZO","CARRIZO"
+"0x7300","FIJI_7300","FIJI","FIJI"
commit 2622ac1554761b8824bfbbb2e3051a632ee38ce7
Author: Alex Deucher <alexander.deucher at amd.com>
Date:   Tue Jul 7 22:46:08 2015 -0400

    Add fiji support
    
    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 4af7f48..2a1b5ab 100644
--- a/src/amdgpu_probe.h
+++ b/src/amdgpu_probe.h
@@ -60,6 +60,7 @@ typedef enum {
 	CHIP_FAMILY_TOPAZ,
 	CHIP_FAMILY_TONGA,
 	CHIP_FAMILY_CARRIZO,
+	CHIP_FAMILY_FIJI,
 	CHIP_FAMILY_LAST
 } AMDGPUChipFamily;