[Openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/via_mode.h src/via_outputs.c

[Kevin Brace]

 configure.ac      |    2 -
 src/via_mode.h    |   55 ------------------------------------------------------
 src/via_outputs.c |   26 -------------------------
 3 files changed, 2 insertions(+), 81 deletions(-)

New commits:
commit 4003121f81c2abbc0801067eaf887cef32602fce
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 25 21:23:44 2017 -0700

    Version bumped to 0.6.111
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 5888dda..9faaed2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.110],
+        [0.6.111],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 7abc9907a61cde162fac0b556bbd1504b7b91c33
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 25 21:22:38 2017 -0700

    Removal of the dot clock table
    
    This table is no longer needed.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_mode.h b/src/via_mode.h
index 733d011..972f331 100644
--- a/src/via_mode.h
+++ b/src/via_mode.h
@@ -46,59 +46,4 @@ union pllparams {
     CARD32 packed;
 };
 
-/*
- * simple lookup table for dotclocks
- *
- */
-static struct ViaDotClock {
-    int DotClock;
-    CARD16 UniChrome;
-    union pllparams UniChromePro;
-} ViaDotClocks[] = {
-    {  25200, 0x513C, /* 0xa79004 */ { { 1, 4, 6, 169 } } },
-    {  25312, 0xC763, /* 0xc49005 */ { { 1, 4, 7, 198 } } },
-    {  26591, 0x471A, /* 0xce9005 */ { { 1, 4, 7, 208 } } },
-    {  31500, 0xC558, /* 0xae9003 */ { { 1, 4, 5, 176 } } },
-    {  31704, 0x471F, /* 0xaf9002 */ { { 1, 4, 4, 177 } } },
-    {  32663, 0xC449, /* 0x479000 */ { { 1, 4, 2,  73 } } },
-    {  33750, 0x4721, /* 0x959002 */ { { 1, 4, 4, 151 } } },
-    {  35500, 0x5877, /* 0x759001 */ { { 1, 4, 3, 119 } } },
-    {  36000, 0x5879, /* 0x9f9002 */ { { 1, 4, 4, 161 } } },
-    {  39822, 0xC459, /* 0x578c02 */ { { 1, 3, 4,  89 } } },
-    {  40000, 0x515F, /* 0x848c04 */ { { 1, 3, 6, 134 } } },
-    {  41164, 0x4417, /* 0x2c8c00 */ { { 1, 3, 2,  46 } } },
-    {  46981, 0x5069, /* 0x678c02 */ { { 1, 3, 4, 105 } } },
-    {  49500, 0xC353, /* 0xa48c04 */ { { 3, 3, 5, 138 } } },
-    {  50000, 0xC354, /* 0x368c00 */ { { 1, 3, 2,  56 } } },
-    {  56300, 0x4F76, /* 0x3d8c00 */ { { 1, 3, 2,  63 } } },
-    {  57275,      0, /* 0x3e8c00 */ { { 1, 3, 5, 157 } } }, /* For XO 1.5 no need for a unichrome clock */
-    {  57284, 0x4E70, /* 0x3e8c00 */ { { 1, 3, 2,  64 } } },
-    {  64995, 0x0D3B, /* 0x6b8c01 */ { { 1, 3, 3, 109 } } },
-    {  65000, 0x0D3B, /* 0x6b8c01 */ { { 1, 3, 3, 109 } } }, /* Slightly unstable on PM800 */
-    {  65028, 0x866D, /* 0x6b8c01 */ { { 1, 3, 3, 109 } } },
-    {  74480, 0x156E, /* 0x288800 */ { { 1, 2, 2,  42 } } },
-    {  75000, 0x156E, /* 0x288800 */ { { 1, 2, 2,  42 } } },
-    {  78800, 0x442C, /* 0x2a8800 */ { { 1, 2, 2,  44 } } },
-    {  81135, 0x0622, /* 0x428801 */ { { 1, 2, 3,  68 } } },
-    {  81613, 0x4539, /* 0x708803 */ { { 1, 2, 5, 114 } } },
-    {  94500, 0x4542, /* 0x4d8801 */ { { 1, 2, 3,  79 } } },
-    { 108000, 0x0B53, /* 0x778802 */ { { 1, 2, 4, 121 } } },
-    { 108280, 0x4879, /* 0x778802 */ { { 1, 2, 4, 121 } } },
-    { 122000, 0x0D6F, /* 0x428800 */ { { 1, 2, 2,  68 } } },
-    { 122726, 0x073C, /* 0x878802 */ { { 1, 2, 4, 137 } } },
-    { 135000, 0x0742, /* 0x6f8801 */ { { 1, 2, 3, 113 } } },
-    { 148500, 0x0853, /* 0x518800 */ { { 1, 2, 2,  83 } } },
-    { 155800, 0x0857, /* 0x558402 */ { { 1, 1, 4,  87 } } },
-    { 157500, 0x422C, /* 0x2a8400 */ { { 1, 1, 2,  44 } } },
-    { 161793, 0x4571, /* 0x6f8403 */ { { 1, 1, 5, 113 } } },
-    { 162000, 0x0A71, /* 0x6f8403 */ { { 1, 1, 5, 113 } } },
-    { 175500, 0x4231, /* 0x2f8400 */ { { 1, 1, 2,  49 } } },
-    { 189000, 0x0542, /* 0x4d8401 */ { { 1, 1, 3,  79 } } },
-    { 202500, 0x0763, /* 0x6F8402 */ { { 1, 1, 4, 113 } } },
-    { 204800, 0x0764, /* 0x548401 */ { { 1, 1, 3,  86 } } },
-    { 218300, 0x043D, /* 0x3b8400 */ { { 1, 1, 2,  61 } } },
-    { 229500, 0x0660, /* 0x3e8400 */ { { 1, 1, 2,  64 } } }, /* Not tested on Pro } */
-    {      0,      0,                { { 0, 0, 0,   0 } } }
-};
-
 #endif /* _VIA_MODE_H_ */
diff --git a/src/via_outputs.c b/src/via_outputs.c
index fa0e946..02bbcf2 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -933,38 +933,14 @@ ViaComputeProDotClock(unsigned clock)
     return bestClock.packed;
 }
 
-/*
- *
- */
 CARD32
 ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     VIAPtr pVia = VIAPTR(pScrn);
-    int i;
 
     if ((pVia->Chipset == VIA_CLE266) || (pVia->Chipset == VIA_KM400)) {
-        CARD32 best1 = 0, best2;
-
-        for (i = 0; ViaDotClocks[i].DotClock; i++)
-            if (ViaDotClocks[i].DotClock == mode->Clock) {
-                best1 = ViaDotClocks[i].UniChrome;
-                break;
-            }
-
-        best2 = ViaComputeDotClock(mode->Clock);
-
-        DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                         "ViaComputeDotClock %d : %04x : %04x\n",
-                         mode->Clock, (unsigned int)best1,
-                         (unsigned int)best2));
-
-        return best2;
+        return ViaComputeDotClock(mode->Clock);
     } else {
-        for (i = 0; ViaDotClocks[i].DotClock; i++)
-            if (ViaDotClocks[i].DotClock == mode->Clock)
-                return ViaDotClocks[i].UniChromePro.packed;
         return ViaComputeProDotClock(mode->Clock);
     }
-
-    return 0;
 }