[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 |    7 -------
 src/via_ums.c     |    4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 45822721962cd1ad5b83738feeedcfe6ad8ec4e9
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Mar 12 13:55:40 2020 -0700

    Version bumped to 0.6.219
    
    Contains cursor disappearance fix for CN333 / CN400 / PM800 / PN800
    chipsets.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 6b18599..db1b147 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.218],
+        [0.6.219],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit fe97ca4463ccfb4aadb0d831d65d19e3399ce991
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Thu Mar 12 13:41:31 2020 -0700

    Cursor disappearance fix for CN400 / PM800 chipsets
    
    It appears that CN400 / PM800 chipsets have only 1 hardware icon rather
    than 2 for newer graphics engines.  Note that hardware icon is used as
    cursor rather than the "real" hardware cursor.  The fix also applies to
    CN333 and PN800 chipsets as well.  The fix was tested on VIA Technologies
    C3 processor based Wyse Vx0 thin client that has CN333 chipset.
    
    Suggested-by: Eric Kudzin <knoppix1337 at yahoo.com>
    Tested-by: Eric Kudzin <knoppix1337 at yahoo.com>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index b2ace41..40e4274 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -181,7 +181,6 @@ viaIGA1InitHI(ScrnInfoPtr pScrn)
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -216,7 +215,6 @@ viaIGA1SetHIStartingAddress(xf86CrtcPtr crtc)
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -242,7 +240,6 @@ viaIGA1DisplayHI(ScrnInfoPtr pScrn, Bool HI_Status)
     CARD32 temp;
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -275,7 +272,6 @@ viaIGA1SetHIDisplayLocation(ScrnInfoPtr pScrn,
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -416,7 +412,6 @@ viaIGA2InitHI(ScrnInfoPtr pScrn)
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -459,7 +454,6 @@ viaIGA2DisplayHI(ScrnInfoPtr pScrn, Bool HI_Status)
     CARD32 temp;
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -492,7 +486,6 @@ viaIGA2SetHIDisplayLocation(ScrnInfoPtr pScrn,
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
-    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
commit a1bfe904198a6ff8874f9e13e8980a02119db18d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Mar 11 10:02:12 2020 -0700

    Redo ClockRange / ClockRanges compilation fix
    
    Use the actual X.Org X Server version for determining whether or not
    ClockRange or ClockRanges should be used.  This commit is effectively
    redoing commit 8bc53d8 (Compilation hooks to support ClockRange and
    ClockRanges).  This commit and commit 8bc53d8 are ultimately related to
    X Server commit 326429b (modes: Remove the ClockRanges type).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index 4047500..00fd0d6 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1194,7 +1194,7 @@ viaUMSCrtcInit(ScrnInfoPtr pScrn)
     VIAPtr pVia = VIAPTR(pScrn);
     VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
     VIARegPtr Regs = &pVIADisplay->SavedReg;
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,8,0,0,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,3,0)
     ClockRangePtr clockRanges;
 #else
     ClockRangesPtr clockRanges;
@@ -1398,7 +1398,7 @@ viaUMSCrtcInit(ScrnInfoPtr pScrn)
      * available, and what sort of modes they can be used for.
      */
 
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,8,0,0,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,3,0)
     clockRanges = xnfalloc(sizeof(ClockRange));
 #else
     clockRanges = xnfalloc(sizeof(ClockRanges));