Radeon 9200 supporti865-agp-0-1-20030728

4 files changed, 37 insertions, 4 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
index 80a55ab8d..c6b77b51a 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
@@ -254,6 +254,7 @@ typedef enum {
     CHIP_FAMILY_M7,
     CHIP_FAMILY_R200,
     CHIP_FAMILY_RV250,
+    CHIP_FAMILY_RV280,
     CHIP_FAMILY_M9,
     CHIP_FAMILY_R300
 } RADEONChipFamily;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
index 2b9027255..95f16d14a 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
@@ -1015,9 +1015,10 @@ static int RADEONDRIKernelInit(RADEONInfoPtr info, ScreenPtr pScreen)
 
     memset(&drmInfo, 0, sizeof(drmRadeonInit));
 
-    if ( (info->ChipFamily == CHIP_FAMILY_R200) ||
+    if ((info->ChipFamily == CHIP_FAMILY_R200) ||
 		 (info->ChipFamily == CHIP_FAMILY_RV250) ||
-		 (info->ChipFamily == CHIP_FAMILY_M9) )
+		 (info->ChipFamily == CHIP_FAMILY_M9) ||
+	         (info->ChipFamily == CHIP_FAMILY_RV280))
        drmInfo.func             = DRM_RADEON_INIT_R200_CP;
     else
        drmInfo.func             = DRM_RADEON_INIT_CP;
@@ -1236,7 +1237,8 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen)
     if (info->ChipFamily == CHIP_FAMILY_R200)
        pDRIInfo->clientDriverName        = R200_DRIVER_NAME;
 	else if ((info->ChipFamily == CHIP_FAMILY_RV250) ||
-			 (info->ChipFamily == CHIP_FAMILY_M9))
+		 (info->ChipFamily == CHIP_FAMILY_M9)||
+		 (info->ChipFamily == CHIP_FAMILY_RV280))
        pDRIInfo->clientDriverName        = RV250_DRIVER_NAME;
     else 
        pDRIInfo->clientDriverName        = RADEON_DRIVER_NAME;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
index f02c9f9c2..2d703d8f6 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
@@ -1412,6 +1412,20 @@ static Bool RADEONPreInitConfig(ScrnInfoPtr pScrn)
 	info->ChipFamily = CHIP_FAMILY_M9;
 	break;
 
+    case PCI_CHIP_RV280_5960:
+    case PCI_CHIP_RV280_5961:
+    case PCI_CHIP_RV280_5962:
+    case PCI_CHIP_RV280_5963:
+	info->ChipFamily = CHIP_FAMILY_RV280;
+	break;
+
+    case PCI_CHIP_RV280_5968:
+    case PCI_CHIP_RV280_5969:
+    case PCI_CHIP_RV280_596A:
+    case PCI_CHIP_RV280_596B:
+	info->ChipFamily = CHIP_FAMILY_RV280;
+	break;
+
     case PCI_CHIP_R300_AD:
     case PCI_CHIP_R300_AE:
     case PCI_CHIP_R300_AF:
@@ -3027,7 +3041,7 @@ static Bool RADEONAgp30Active(ScrnInfoPtr pScrn)
         return TRUE;
     }
     
-    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "[agp] Using AGP v2.0\n", status);
+    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "[agp] Using AGP v2.0\n");
 
     return FALSE;
 }
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c
index bcf80c188..4c9eb7dea 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c
@@ -108,6 +108,14 @@ SymTabRec RADEONChipsets[] = {
     { PCI_CHIP_RV250_Le, "ATI Radeon Mobility M9 Le (AGP)" },
     { PCI_CHIP_RV250_Lf, "ATI Radeon Mobility M9 Lf (AGP)" },
     { PCI_CHIP_RV250_Lg, "ATI Radeon Mobility M9 Lg (AGP)" },
+    { PCI_CHIP_RV280_5960, "ATI Radeon 9200 5960 (AGP)" },
+    { PCI_CHIP_RV280_5961, "ATI Radeon 9200 5961 (AGP)" },
+    { PCI_CHIP_RV280_5962, "ATI Radeon 9200 5962 (AGP)" },
+    { PCI_CHIP_RV280_5963, "ATI Radeon 9200 5963 (AGP)" },
+    { PCI_CHIP_RV280_5968, "ATI Radeon M9+ 5968 (AGP)" },
+    { PCI_CHIP_RV280_5969, "ATI Radeon M9+ 5969 (AGP)" },
+    { PCI_CHIP_RV280_596A, "ATI Radeon M9+ 596A (AGP)" },
+    { PCI_CHIP_RV280_596B, "ATI Radeon M9+ 596B (AGP)" },
     { PCI_CHIP_R300_AD, "ATI Radeon 9500 AD (AGP)" },
     { PCI_CHIP_R300_AE, "ATI Radeon 9500 AE (AGP)" },
     { PCI_CHIP_R300_AF, "ATI Radeon 9500 AF (AGP)" },
@@ -154,6 +162,14 @@ PciChipsets RADEONPciChipsets[] = {
     { PCI_CHIP_RV250_Le, PCI_CHIP_RV250_Le, RES_SHARED_VGA },
     { PCI_CHIP_RV250_Lf, PCI_CHIP_RV250_Lf, RES_SHARED_VGA },
     { PCI_CHIP_RV250_Lg, PCI_CHIP_RV250_Lg, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_5960, PCI_CHIP_RV280_5960, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_5961, PCI_CHIP_RV280_5961, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_5962, PCI_CHIP_RV280_5962, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_5963, PCI_CHIP_RV280_5963, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_5968, PCI_CHIP_RV280_5968, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_5969, PCI_CHIP_RV280_5969, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_596A, PCI_CHIP_RV280_596A, RES_SHARED_VGA },
+    { PCI_CHIP_RV280_596B, PCI_CHIP_RV280_596A, RES_SHARED_VGA },
     { PCI_CHIP_R300_AD, PCI_CHIP_R300_AD, RES_SHARED_VGA },
     { PCI_CHIP_R300_AE, PCI_CHIP_R300_AE, RES_SHARED_VGA },
     { PCI_CHIP_R300_AF, PCI_CHIP_R300_AF, RES_SHARED_VGA },