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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |   11 ++++++++---
 src/via_ums.c     |    4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 281ad0454e7f803bff699804e6e2e42800aae9c9
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Nov 15 17:50:29 2019 -0800

    Version bumped to 0.6.194
    
    Added a fix for FP going bonkers in VT mode after ACPI S3 State resume.
    The fix was verified on Sylvania g netbook (VIA NanoBook UMD Reference
    Design).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 816ea4a..36d89a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.193],
+        [0.6.194],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 70b04a59d3152f94219afd02c5e4c7543d85bc66
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Nov 15 17:48:40 2019 -0800

    Fix for a FP display problem in VT mode after ACPI S3 State resume
    
    This issue was observed on Sylvania g netbook (VIA NanoBook UMD
    Reference Design).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index e04f805..b2ace41 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1953,6 +1953,10 @@ viaIGA1Restore(ScrnInfoPtr pScrn)
     hwp->writeSeq(hwp, 0x2A, Regs->SR[0x2A]);
     hwp->writeSeq(hwp, 0x2B, Regs->SR[0x2B]);
 
+    hwp->writeSeq(hwp, 0x2C,
+                    (hwp->readSeq(hwp, 0x2C) & (~0x01)) |
+                    (Regs->SR[0x2C] & 0x01));
+
     hwp->writeSeq(hwp, 0x2D, Regs->SR[0x2D]);
     hwp->writeSeq(hwp, 0x2E, Regs->SR[0x2E]);
 
@@ -1974,6 +1978,10 @@ viaIGA1Restore(ScrnInfoPtr pScrn)
         break;
     }
 
+    hwp->writeSeq(hwp, 0x3D,
+                    (hwp->readSeq(hwp, 0x3D) & (~0x01)) |
+                    (Regs->SR[0x3D] & 0x01));
+
     /* Restore PLL settings and several miscellaneous registers.
      * For UniChrome, register 3C5.44 through 3C5.4B are restored.
      * For UniChrome Pro and Chrome 9, register 3C5.44 through 3C5.4C
diff --git a/src/via_ums.c b/src/via_ums.c
index a8f5e2e..84167a0 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1114,11 +1114,15 @@ umsCrtcInit(ScrnInfoPtr pScrn)
     Regs->SR[0x2A] = hwp->readSeq(hwp, 0x2A);
     Regs->SR[0x2B] = hwp->readSeq(hwp, 0x2B);
 
+    Regs->SR[0x2C] = hwp->readSeq(hwp, 0x2C);
+
     Regs->SR[0x2D] = hwp->readSeq(hwp, 0x2D);
     Regs->SR[0x2E] = hwp->readSeq(hwp, 0x2E);
     Regs->SR[0x2F] = hwp->readSeq(hwp, 0x2F);
     Regs->SR[0x30] = hwp->readSeq(hwp, 0x30);
 
+    Regs->SR[0x3D] = hwp->readSeq(hwp, 0x3D);
+
     Regs->SR[0x44] = hwp->readSeq(hwp, 0x44);
     Regs->SR[0x45] = hwp->readSeq(hwp, 0x45);
     Regs->SR[0x46] = hwp->readSeq(hwp, 0x46);
commit 78e6c1cbe31871335539e686c4552e1f55605ff7
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Nov 15 17:48:31 2019 -0800

    Stop unnecessary restore of SR25 and SR26 inside viaIGA1Restore()
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 1a84bea..e04f805 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1941,7 +1941,6 @@ viaIGA1Restore(ScrnInfoPtr pScrn)
     case VIA_P4M890:
         hwp->writeSeq(hwp, 0x23, Regs->SR[0x23]);
         hwp->writeSeq(hwp, 0x24, Regs->SR[0x24]);
-        hwp->writeSeq(hwp, 0x25, Regs->SR[0x25]);
 
         hwp->writeSeq(hwp, 0x27, Regs->SR[0x27]);
         hwp->writeSeq(hwp, 0x28, Regs->SR[0x28]);
@@ -1951,8 +1950,6 @@ viaIGA1Restore(ScrnInfoPtr pScrn)
         break;
     }
 
-    hwp->writeSeq(hwp, 0x26, Regs->SR[0x26]);
-
     hwp->writeSeq(hwp, 0x2A, Regs->SR[0x2A]);
     hwp->writeSeq(hwp, 0x2B, Regs->SR[0x2B]);