[devel-bandwidth_VT3344]

- Add VT3344 and VT3157 to the bandwidth table.
- Update panel and limited support warnings.

1 files changed, 14 insertions, 6 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index 332f1e1..7701c62 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -655,7 +655,9 @@ ViaGetMemoryClock(ScrnInfoPtr pScrn)
 #define VIA_BW_VT7205A  3
 #define VIA_BW_VT3108   4
 #define VIA_BW_VT3118   5
-#define VIA_BW_ALL      6
+#define VIA_BW_VT3344   6
+#define VIA_BW_VT3157   7
+#define VIA_BW_ALL      8
 
 /*
  * 393216000 is for SDR133 in via_refresh.h
@@ -670,7 +672,9 @@ static struct {
     { VIA_BW_VT7205,  { 394000000,  461000000,  461000000, VIA_BW_MIN } },
     { VIA_BW_VT7205A, { 394000000,  461000000,  461000000,  461000000 } },
     { VIA_BW_VT3108,  { 394000000,  461000000,  461000000,  461000000 } },
-    { VIA_BW_VT3118,  { 394000000,  461000000,  461000000,  461000000 } }
+    { VIA_BW_VT3118,  { 394000000,  461000000,  461000000,  461000000 } },
+    { VIA_BW_VT3344,  { 394000000,  461000000,  461000000,  461000000 } },
+    { VIA_BW_VT3157,  { 394000000,  461000000,  461000000,  461000000 } },
 };
 
 /*
@@ -708,6 +712,10 @@ ViaGetMemoryBandwidth(ScrnInfoPtr pScrn)
 	return ViaBandwidthTable[VIA_BW_VT3108].Bandwidth[pVia->MemClk];
     case VT3118:
 	return ViaBandwidthTable[VIA_BW_VT3118].Bandwidth[pVia->MemClk];
+    case VT3344:
+        return ViaBandwidthTable[VIA_BW_VT3344].Bandwidth[pVia->MemClk];
+    case VT3157:
+        return ViaBandwidthTable[VIA_BW_VT3157].Bandwidth[pVia->MemClk];
     default:
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: Unknown Chipset.\n", __func__);
 	return VIA_BW_MIN;
@@ -1136,6 +1144,7 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     case VT3108:
     case VT3118:
     case VT3344:
+    case VT3157:
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Support for %s is limited at"
                    " this time.\n", pScrn->chipset);
         break;
@@ -1278,9 +1287,8 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
 	return FALSE;
     }
 
-    if (ModeInfo->PanelActive && ((pVia->Chipset == VT3108) || 
-                                   (pVia->Chipset == VT3118) ||
-                                   (pVia->Chipset == VT3344)))
+    if (ModeInfo->PanelActive && ((pVia->Chipset != VT3122) || 
+                                  (pVia->Chipset != VT7205)))
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
                    "Panel on %s is currently not supported.\n", pScrn->chipset);
 
@@ -1314,7 +1322,7 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
      * VT3122A: primary AdjustFrame only is able to use 24bits, so we are
      * limited to 12x11bits; 4080x2048 (~2:1), 3344x2508 (4:3) or 2896x2896
      * (1:1). 
-     * Test VT3122Cx, VT7205, VT7205A, VT3108, VT3118, VT3344 please.
+     * Test VT3122Cx, VT7205, VT7205A, VT3108, VT3118, VT3344, VT3157 please.
      *
      * We should be able to limit the memory available for a mode to 32MB,
      * yet xf86ValidateModes (or miScanLineWidth) fails to catch this properly