[openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/via_display.c src/via_fp.c src/via_ums.c src/via_ums.h

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |   10 +++++-----
 src/via_fp.c      |    5 ++++-
 src/via_ums.c     |    7 -------
 src/via_ums.h     |    4 ----
 5 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 8bb5fd902bc948630089a3e6516dacad1e0c95f6
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Dec 29 16:54:42 2018 -0600

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

diff --git a/configure.ac b/configure.ac
index f031c5c..351c327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.179],
+        [0.6.180],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit c014356615cc90191ae4576a1cf814c69fd162bd
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Dec 29 16:28:52 2018 -0600

    Obtain FP screen resolution information from saved VGA registers
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_fp.c b/src/via_fp.c
index c536417..a9d1930 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -706,13 +706,16 @@ viaFPGetFPInfoScratchPad(xf86OutputPtr output)
 {
     ScrnInfoPtr pScrn = output->scrn;
     vgaHWPtr hwp = VGAHWPTR(pScrn);
+    VIAPtr pVia = VIAPTR(pScrn);
+    VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
     VIAFPPtr pVIAFP = (VIAFPPtr) output->driver_private;
+    VIARegPtr Regs = &pVIADisplay->SavedReg;
     CARD8 index;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered %s.\n", __func__));
 
-    index = hwp->readCrtc(hwp, 0x3F) & 0x0F;
+    index = Regs->CR[0x3F] & 0x0F;
 
     pVIAFP->NativeModeIndex = index;
     pVIAFP->NativeWidth = ViaPanelNativeModes[index].Width;
commit 7d5e01a41fa21293c286a5e42ac3ed4371bb9103
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Nov 28 16:50:26 2018 -0800

    Stop the use of originalCRXX variables inside VIADisplayRec struct
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index a6773f5..03cf12f 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -959,11 +959,11 @@ viaIGAInitCommon(ScrnInfoPtr pScrn)
     }
 
     /* 3X5.3B through 3X5.3F are scratch pad registers. */
-    ViaCrtcMask(hwp, 0x3B, pVIADisplay->originalCR3B, 0xFF);
-    ViaCrtcMask(hwp, 0x3C, pVIADisplay->originalCR3C, 0xFF);
-    ViaCrtcMask(hwp, 0x3D, pVIADisplay->originalCR3D, 0xFF);
-    ViaCrtcMask(hwp, 0x3E, pVIADisplay->originalCR3E, 0xFF);
-    ViaCrtcMask(hwp, 0x3F, pVIADisplay->originalCR3F, 0xFF);
+    ViaCrtcMask(hwp, 0x3B, Regs->CR[0x3B], 0xFF);
+    ViaCrtcMask(hwp, 0x3C, Regs->CR[0x3C], 0xFF);
+    ViaCrtcMask(hwp, 0x3D, Regs->CR[0x3D], 0xFF);
+    ViaCrtcMask(hwp, 0x3E, Regs->CR[0x3E], 0xFF);
+    ViaCrtcMask(hwp, 0x3F, Regs->CR[0x3F], 0xFF);
 
     /* 3X5.47[5] - Peep at the PCI-bus
      *             0: Disable
diff --git a/src/via_ums.c b/src/via_ums.c
index b0c3aa3..a789e4f 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1227,13 +1227,6 @@ umsCrtcInit(ScrnInfoPtr pScrn)
         }
     }
 
-    /* 3X5.3B through 3X5.3F are scratch pad registers. */
-    pVIADisplay->originalCR3B = hwp->readCrtc(hwp, 0x3B);
-    pVIADisplay->originalCR3C = hwp->readCrtc(hwp, 0x3C);
-    pVIADisplay->originalCR3D = hwp->readCrtc(hwp, 0x3D);
-    pVIADisplay->originalCR3E = hwp->readCrtc(hwp, 0x3E);
-    pVIADisplay->originalCR3F = hwp->readCrtc(hwp, 0x3F);
-
     /* Read memory bandwidth from registers. */
     pVia->MemClk = hwp->readCrtc(hwp, 0x3D) >> 4;
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff --git a/src/via_ums.h b/src/via_ums.h
index 898da05..6286983 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -228,10 +228,6 @@ typedef struct _VIADISPLAY {
     /* OLPC XO-1.5 */
     Bool                isOLPCXO15;
 
-    /* Shadow copy of CR3B through CR3F. */
-    CARD8       originalCR3B, originalCR3C, originalCR3D,
-                originalCR3E, originalCR3F;
-
     VIARegRec           SavedReg;
 
     xf86OutputPtr tv;