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

[Alex Deucher]

 src/atipciids.h      |    2 +-
 src/radeon_chipset.h |    2 +-
 src/radeon_driver.c  |    9 +++++----
 src/radeon_probe.c   |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

New commits:
diff-tree fe66cc4e02a52e1d014ae5de192c65e8abd7f58a (from 314e8fdbe5369e4c1786d176d03d0d2a046f25d5)
Author: Tormod Volden <bugzi06.fdo.tormod at xoxy.net>
Date:   Fri Oct 5 20:10:55 2007 -0400

    RADEON: rename to PCI_CHIP_RS485_5975 everywhere
    
    RS482_5975 is actually RS485.  see bug 12048

diff --git a/src/atipciids.h b/src/atipciids.h
index 1c0f59a..2aa8a3e 100644
--- a/src/atipciids.h
+++ b/src/atipciids.h
@@ -252,7 +252,7 @@
 #define PCI_CHIP_RV280_5965 		0x5965
 #define PCI_CHIP_RN50_5969		0x5969
 #define PCI_CHIP_RS482_5974             0x5974
-#define PCI_CHIP_RS482_5975             0x5975
+#define PCI_CHIP_RS485_5975             0x5975
 #define PCI_CHIP_RS400_5A41             0x5A41
 #define PCI_CHIP_RS400_5A42             0x5A42
 #define PCI_CHIP_RC410_5A61             0x5A61
diff --git a/src/radeon_chipset.h b/src/radeon_chipset.h
index 5cca4c8..890babd 100644
--- a/src/radeon_chipset.h
+++ b/src/radeon_chipset.h
@@ -89,7 +89,7 @@ static SymTabRec RADEONChipsets[] = {
     { PCI_CHIP_RS480_5954, "ATI Radeon XPRESS 200 5954 (PCIE)" },
     { PCI_CHIP_RS480_5955, "ATI Radeon XPRESS 200M 5955 (PCIE)" },
     { PCI_CHIP_RS482_5974, "ATI Radeon XPRESS 200 5974 (PCIE)" },
-    { PCI_CHIP_RS482_5975, "ATI Radeon XPRESS 200M 5975 (PCIE)" },
+    { PCI_CHIP_RS485_5975, "ATI Radeon XPRESS 200M 5975 (PCIE)" },
     { PCI_CHIP_RV410_5E48, "ATI FireGL V5000 (RV410) (PCIE)" },
     { PCI_CHIP_RV410_564A, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
     { PCI_CHIP_RV410_564B, "ATI Mobility FireGL V5000 (M26) (PCIE)" },
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index e247f1d..03f531e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1673,7 +1673,7 @@ static Bool RADEONPreInitChipType(ScrnIn
     case PCI_CHIP_RS400_5A42:
     case PCI_CHIP_RC410_5A62:
     case PCI_CHIP_RS480_5955:
-    case PCI_CHIP_RS482_5975:
+    case PCI_CHIP_RS485_5975:
         info->IsMobility = TRUE;
     case PCI_CHIP_RS400_5A41:
     case PCI_CHIP_RC410_5A61:
@@ -2086,10 +2086,10 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
 	info->Chipset == PCI_CHIP_RN50_5969 ||
 	info->Chipset == PCI_CHIP_RC410_5A61 ||
 	info->Chipset == PCI_CHIP_RC410_5A62 ||
-	info->Chipset == PCI_CHIP_RS482_5975) {
+	info->Chipset == PCI_CHIP_RS485_5975) {
     	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50/RC410/RS482 forced on -- "
+		"Direct rendering for RN50/RC410/RS485 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
     	} else {
@@ -2132,7 +2132,7 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
 	info->Chipset == PCI_CHIP_RS480_5954 ||
 	info->Chipset == PCI_CHIP_RS480_5955 ||
 	info->Chipset == PCI_CHIP_RS482_5974 ||
-	info->Chipset == PCI_CHIP_RS482_5975) {
+	info->Chipset == PCI_CHIP_RS485_5975) {
 
 	if (info->pKernelDRMVersion->version_minor < 27) {
  	     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 5c7d16f..d68a956 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -144,7 +144,7 @@ PciChipsets RADEONPciChipsets[] = {
     { PCI_CHIP_RS480_5954, PCI_CHIP_RS480_5954, RES_SHARED_VGA },
     { PCI_CHIP_RS480_5955, PCI_CHIP_RS480_5955, RES_SHARED_VGA },
     { PCI_CHIP_RS482_5974, PCI_CHIP_RS482_5974, RES_SHARED_VGA },
-    { PCI_CHIP_RS482_5975, PCI_CHIP_RS482_5975, RES_SHARED_VGA },
+    { PCI_CHIP_RS485_5975, PCI_CHIP_RS485_5975, RES_SHARED_VGA },
     { PCI_CHIP_RV410_5E48, PCI_CHIP_RV410_5E48, RES_SHARED_VGA },
     { PCI_CHIP_RV410_564A, PCI_CHIP_RV410_564A, RES_SHARED_VGA },
     { PCI_CHIP_RV410_564B, PCI_CHIP_RV410_564B, RES_SHARED_VGA },
diff-tree 314e8fdbe5369e4c1786d176d03d0d2a046f25d5 (from abbafe6db7c0d24efc61a05950d4214c00d3f043)
Author: Tormod Volden <bugzi06.fdo.tormod at xoxy.net>
Date:   Fri Oct 5 20:05:54 2007 -0400

    RADEON: Disable DRI by default for RS482 cards
    
    fixes bug 12048

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 6f8a753..e247f1d 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2085,10 +2085,11 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
     if (info->Chipset == PCI_CHIP_RN50_515E ||
 	info->Chipset == PCI_CHIP_RN50_5969 ||
 	info->Chipset == PCI_CHIP_RC410_5A61 ||
-	info->Chipset == PCI_CHIP_RC410_5A62) {
+	info->Chipset == PCI_CHIP_RC410_5A62 ||
+	info->Chipset == PCI_CHIP_RS482_5975) {
     	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-		"Direct rendering for RN50/RC410 forced on -- "
+		"Direct rendering for RN50/RC410/RS482 forced on -- "
 		"This is NOT officially supported at the hardware level "
 		"and may cause instability or lockups\n");
     	} else {