xf86-video-ati: Branch 'master' - 3 commits

Alex Deucher agd5f at kemper.freedesktop.org
Wed Mar 2 16:50:41 PST 2011


 src/ati_pciids_gen.h              |   14 ++++++++++++++
 src/pcidb/ati_pciids.csv          |   14 ++++++++++++++
 src/radeon.h                      |    1 +
 src/radeon_chipinfo_gen.h         |   14 ++++++++++++++
 src/radeon_chipset_gen.h          |   14 ++++++++++++++
 src/radeon_kms.c                  |    1 +
 src/radeon_pci_chipset_gen.h      |   14 ++++++++++++++
 src/radeon_pci_device_match_gen.h |   14 ++++++++++++++
 8 files changed, 86 insertions(+)

New commits:
commit 6319a33cb7bd8dba1eaf47bee1e2608cee5d7600
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Mar 2 19:38:04 2011 -0500

    kms: add cayman pci ids
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index f7b7569..598dd72 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -500,6 +500,20 @@
 #define PCI_CHIP_CEDAR_68F8 0x68F8
 #define PCI_CHIP_CEDAR_68F9 0x68F9
 #define PCI_CHIP_CEDAR_68FE 0x68FE
+#define PCI_CHIP_CAYMAN_6700 0x6700
+#define PCI_CHIP_CAYMAN_6701 0x6701
+#define PCI_CHIP_CAYMAN_6702 0x6702
+#define PCI_CHIP_CAYMAN_6703 0x6703
+#define PCI_CHIP_CAYMAN_6704 0x6704
+#define PCI_CHIP_CAYMAN_6705 0x6705
+#define PCI_CHIP_CAYMAN_6706 0x6706
+#define PCI_CHIP_CAYMAN_6707 0x6707
+#define PCI_CHIP_CAYMAN_6708 0x6708
+#define PCI_CHIP_CAYMAN_6709 0x6709
+#define PCI_CHIP_CAYMAN_6718 0x6718
+#define PCI_CHIP_CAYMAN_6719 0x6719
+#define PCI_CHIP_CAYMAN_671C 0x671C
+#define PCI_CHIP_CAYMAN_671D 0x671D
 #define PCI_CHIP_BARTS_6720 0x6720
 #define PCI_CHIP_BARTS_6721 0x6721
 #define PCI_CHIP_BARTS_6722 0x6722
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e8bfb4c..07454af 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -501,6 +501,20 @@
 "0x68F8","CEDAR_68F8","CEDAR",,,,,,"CEDAR"
 "0x68F9","CEDAR_68F9","CEDAR",,,,,,"ATI Radeon HD 5450"
 "0x68FE","CEDAR_68FE","CEDAR",,,,,,"CEDAR"
+"0x6700","CAYMAN_6700","CAYMAN",,,,,,"CAYMAN"
+"0x6701","CAYMAN_6701","CAYMAN",,,,,,"CAYMAN"
+"0x6702","CAYMAN_6702","CAYMAN",,,,,,"CAYMAN"
+"0x6703","CAYMAN_6703","CAYMAN",,,,,,"CAYMAN"
+"0x6704","CAYMAN_6704","CAYMAN",,,,,,"CAYMAN"
+"0x6705","CAYMAN_6705","CAYMAN",,,,,,"CAYMAN"
+"0x6706","CAYMAN_6706","CAYMAN",,,,,,"CAYMAN"
+"0x6707","CAYMAN_6707","CAYMAN",,,,,,"CAYMAN"
+"0x6708","CAYMAN_6708","CAYMAN",,,,,,"CAYMAN"
+"0x6709","CAYMAN_6709","CAYMAN",,,,,,"CAYMAN"
+"0x6718","CAYMAN_6718","CAYMAN",,,,,,"AMD Radeon HD 6900 Series"
+"0x6719","CAYMAN_6719","CAYMAN",,,,,,"AMD Radeon HD 6900 Series"
+"0x671C","CAYMAN_671C","CAYMAN",,,,,,"CAYMAN"
+"0x671D","CAYMAN_671D","CAYMAN",,,,,,"CAYMAN"
 "0x6720","BARTS_6720","BARTS",1,,,,,"AMD Radeon HD 6900M Series"
 "0x6721","BARTS_6721","BARTS",1,,,,,"Mobility Radeon HD 6000 Series"
 "0x6722","BARTS_6722","BARTS",,,,,,"BARTS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index a90fae7..2caeed9 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -420,6 +420,20 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x68F8, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
  { 0x68F9, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
  { 0x68FE, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
+ { 0x6700, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6701, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6702, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6703, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6704, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6705, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6706, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6707, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6708, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6709, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6718, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6719, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x671C, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x671D, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
  { 0x6720, CHIP_FAMILY_BARTS, 1, 0, 0, 0, 0 },
  { 0x6721, CHIP_FAMILY_BARTS, 1, 0, 0, 0, 0 },
  { 0x6722, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 2af046c..e4c38f0 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -420,6 +420,20 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_CEDAR_68F8, "CEDAR" },
   { PCI_CHIP_CEDAR_68F9, "ATI Radeon HD 5450" },
   { PCI_CHIP_CEDAR_68FE, "CEDAR" },
+  { PCI_CHIP_CAYMAN_6700, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6701, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6702, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6703, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6704, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6705, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6706, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6707, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6708, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6709, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_6718, "AMD Radeon HD 6900 Series" },
+  { PCI_CHIP_CAYMAN_6719, "AMD Radeon HD 6900 Series" },
+  { PCI_CHIP_CAYMAN_671C, "CAYMAN" },
+  { PCI_CHIP_CAYMAN_671D, "CAYMAN" },
   { PCI_CHIP_BARTS_6720, "AMD Radeon HD 6900M Series" },
   { PCI_CHIP_BARTS_6721, "Mobility Radeon HD 6000 Series" },
   { PCI_CHIP_BARTS_6722, "BARTS" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index b4b2a79..1165049 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -420,6 +420,20 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_CEDAR_68F8, PCI_CHIP_CEDAR_68F8, RES_SHARED_VGA },
  { PCI_CHIP_CEDAR_68F9, PCI_CHIP_CEDAR_68F9, RES_SHARED_VGA },
  { PCI_CHIP_CEDAR_68FE, PCI_CHIP_CEDAR_68FE, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6700, PCI_CHIP_CAYMAN_6700, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6701, PCI_CHIP_CAYMAN_6701, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6702, PCI_CHIP_CAYMAN_6702, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6703, PCI_CHIP_CAYMAN_6703, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6704, PCI_CHIP_CAYMAN_6704, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6705, PCI_CHIP_CAYMAN_6705, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6706, PCI_CHIP_CAYMAN_6706, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6707, PCI_CHIP_CAYMAN_6707, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6708, PCI_CHIP_CAYMAN_6708, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6709, PCI_CHIP_CAYMAN_6709, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6718, PCI_CHIP_CAYMAN_6718, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6719, PCI_CHIP_CAYMAN_6719, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_671C, PCI_CHIP_CAYMAN_671C, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_671D, PCI_CHIP_CAYMAN_671D, RES_SHARED_VGA },
  { PCI_CHIP_BARTS_6720, PCI_CHIP_BARTS_6720, RES_SHARED_VGA },
  { PCI_CHIP_BARTS_6721, PCI_CHIP_BARTS_6721, RES_SHARED_VGA },
  { PCI_CHIP_BARTS_6722, PCI_CHIP_BARTS_6722, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index aa50306..4bebfeb 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -420,6 +420,20 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F8, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F9, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68FE, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6700, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6701, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6702, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6703, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6704, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6705, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6706, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6707, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6708, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6709, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6718, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6719, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671D, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6720, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6721, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6722, 0 ),
commit fd65def45a57e3242596274d270791df8abc8e29
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jan 13 17:02:31 2011 -0500

    kms: no accel yet for cayman
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index b618045..125a132 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -258,6 +258,7 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
     }
 
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE) ||
+	(info->ChipFamily >= CHIP_FAMILY_CAYMAN) ||
 	(!RADEONIsAccelWorking(pScrn))) {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "GPU accel disabled or not working, using shadowfb for KMS\n");
commit 585e2a3b803b6d3e070f2427e9cb49bab0949239
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jan 13 16:58:01 2011 -0500

    kms: add cayman chip family
    
    KMS only.  No UMS support for cayman.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon.h b/src/radeon.h
index 4c43717..4f5095d 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -363,6 +363,7 @@ typedef enum {
     CHIP_FAMILY_BARTS,
     CHIP_FAMILY_TURKS,
     CHIP_FAMILY_CAICOS,
+    CHIP_FAMILY_CAYMAN,
     CHIP_FAMILY_LAST
 } RADEONChipFamily;
 


More information about the xorg-commit mailing list