DDR533 support. Fujitsu/Siemens Amilo L7320 pci id.

5 files changed, 37 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 848e02e..0f137d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,21 @@
+2006-10-11  Xavier Bachelot <xb_ml-at-kelkoo-dot-net>
+
+	reviewed by: Ivor
+
+	* unichrome/via_bios.h:
+	* unichrome/via_id.c:
+	* unichrome/via_mode.h:
+	* unichrome/via_video.c: (DecideOverlaySupport):
+
+	DDR533 memory support and small clean up.
+	Fujitsu/Siemens Amilo L7320 pci id (reported by DeNayGo).
+
 2006-10-03 Thomas Hellstrom  <thomas-at-tungstengraphics-dot-com>
 
 	* unichrome/via_video.c: (viaPutImage):
 
 	Removed some stray debug messages.
+	
 
 2006-10-02  Benno Schulenberg  <bensberg-at-justemail-dot-net>
 
diff --git a/unichrome/via_bios.h b/unichrome/via_bios.h
index f51cb83..c502bc0 100644
--- a/unichrome/via_bios.h
+++ b/unichrome/via_bios.h
@@ -81,7 +81,8 @@
 #define VIA_MEM_DDR266  0x04
 #define VIA_MEM_DDR333  0x05
 #define VIA_MEM_DDR400  0x06
-#define VIA_MEM_END     0x07
+#define VIA_MEM_DDR533  0x07
+#define VIA_MEM_END     0x08
 #define VIA_MEM_NONE    0xFF
 
 /* Digital Output Bus Width */
diff --git a/unichrome/via_id.c b/unichrome/via_id.c
index ba4166a..5a6a756 100644
--- a/unichrome/via_id.c
+++ b/unichrome/via_id.c
@@ -176,6 +176,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
     {"Biostar P4M80-M4",                      VIA_VM800,   0x1565, 0x1202, VIA_DEVICE_CRT}, /* shares numbers with Biostar P4VMA-M */
     {"Fujitsu/Siemens Amilo Pro V2030",       VIA_VM800,   0x1734, 0x109B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"Fujitsu/Siemens Amilo Pro V2035",       VIA_VM800,   0x1734, 0x10AE, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+    {"Fujitsu/Siemens Amilo L7320",           VIA_VM800,   0x1734, 0x10CD, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
     {"ASRock P4VM800",                        VIA_VM800,   0x1849, 0x3344, VIA_DEVICE_CRT},
     {"Asustek P5V800-MX",                     VIA_VM800,   0x3344, 0x1122, VIA_DEVICE_CRT},
     /* keep this */
diff --git a/unichrome/via_mode.h b/unichrome/via_mode.h
index b2e1ad1..ea7bb87 100644
--- a/unichrome/via_mode.h
+++ b/unichrome/via_mode.h
@@ -51,13 +51,13 @@ static struct {
     CARD8 Device; /* equal to index */
     CARD32 Bandwidth[VIA_MEM_END];
 } ViaBandwidthTable[VIA_BW_ALL] = {
-    { VIA_BW_CLE266A, { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000, VIA_BW_MIN, VIA_BW_MIN } },
-    { VIA_BW_CLE266C, { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000, VIA_BW_MIN, VIA_BW_MIN } },
-    { VIA_BW_KM400,   { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000, VIA_BW_MIN } },
-    { VIA_BW_KM400A,  { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000 } },
-    { VIA_BW_K8M800,  { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000 } },
-    { VIA_BW_PM800,   { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000 } },
-    { VIA_BW_VM800,   { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000 } }
+    { VIA_BW_CLE266A, { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000, VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN } },
+    { VIA_BW_CLE266C, { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000, VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN } },
+    { VIA_BW_KM400,   { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000, VIA_BW_MIN, VIA_BW_MIN } },
+    { VIA_BW_KM400A,  { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000, VIA_BW_MIN } },
+    { VIA_BW_K8M800,  { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000, VIA_BW_MIN } },
+    { VIA_BW_PM800,   { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000,  922000000 } },
+    { VIA_BW_VM800,   { VIA_BW_MIN, VIA_BW_MIN, VIA_BW_MIN,  394000000,  461000000,  461000000,  461000000,  922000000 } }
 };
     
 /*
diff --git a/unichrome/via_video.c b/unichrome/via_video.c
index 24bebf5..62b8a88 100644
--- a/unichrome/via_video.c
+++ b/unichrome/via_video.c
@@ -277,7 +277,8 @@ DecideOverlaySupport(ScrnInfoPtr pScrn)
 
     if (pVia->ChipId != PCI_CHIP_VT3205 &&
 	pVia->ChipId != PCI_CHIP_VT3204 &&
-	pVia->ChipId != PCI_CHIP_VT3259 && pVia->ChipId != PCI_CHIP_VT3314) {
+	pVia->ChipId != PCI_CHIP_VT3259 &&
+	pVia->ChipId != PCI_CHIP_VT3314) {
 	CARD32 bandwidth = (mode->HDisplay >> 4) * (mode->VDisplay >> 5) *
 	    pScrn->bitsPerPixel * mode->VRefresh;
 
@@ -316,39 +317,36 @@ DecideOverlaySupport(ScrnInfoPtr pScrn)
 	switch (pVia->MemClk) {
 	case VIA_MEM_SDR100:
 	    mClock = 50;	       /*HW base on 128 bit */
+	    memEfficiency = (float)SINGLE_3205_100;
 	    break;
 	case VIA_MEM_SDR133:
 	    mClock = 66.5;
+	    memEfficiency = (float)SINGLE_3205_100;
 	    break;
 	case VIA_MEM_DDR200:
 	    mClock = 100;
+	    memEfficiency = (float)SINGLE_3205_100;
 	    break;
 	case VIA_MEM_DDR266:
 	    mClock = 133;
+	    memEfficiency = (float)SINGLE_3205_133;
 	    break;
 	case VIA_MEM_DDR333:
 	    mClock = 166;
+	    memEfficiency = (float)SINGLE_3205_133;
 	    break;
-	default:
-	    /*Unknow DRAM Type */
-	    DBG_DD(ErrorF("Unknow DRAM Type!\n"));
-	    mClock = 166;
-	    break;
-	}
-
-	switch (pVia->MemClk) {
-	case VIA_MEM_SDR100:
-	case VIA_MEM_SDR133:
-	case VIA_MEM_DDR200:
-	    memEfficiency = (float)SINGLE_3205_100;
+	case VIA_MEM_DDR400:
+	    mClock = 200;
+	    memEfficiency = (float)SINGLE_3205_133;
 	    break;
-	case VIA_MEM_DDR266:
-	case VIA_MEM_DDR333:
+	case VIA_MEM_DDR533:
+	    mClock = 266;
 	    memEfficiency = (float)SINGLE_3205_133;
 	    break;
 	default:
-	    /*Unknow DRAM Type . */
+	    /*Unknow DRAM Type */
 	    DBG_DD(ErrorF("Unknow DRAM Type!\n"));
+	    mClock = 166;
 	    memEfficiency = (float)SINGLE_3205_133;
 	    break;
 	}