[openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/via_driver.c

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e633a7ca81c90574b2ace85c4959fdbfb91731b1
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jan 14 13:53:11 2020 -0600

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

diff --git a/configure.ac b/configure.ac
index 4b50a93..aff9299 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.207],
+        [0.6.208],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit da518d8ece77243aefb535caf5a7e918e36e5dad
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jan 14 13:22:44 2020 -0600

    Revert commit 42b0af34ee0c598b2674b338dff391e0ca874176
    
    Commit 42b0af34ee0c598b2674b338dff391e0ca874176 (Move the location
    where the color map is initialized) causes X.Org X Server 1.19.1 to
    fail during boot time.  Reversing it appears to fix the issue.
    
    Suggested-by: Eric Kudzin <knoppix1337 at yahoo.com>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 826aaba..889d577 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1519,14 +1519,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
 
     xf86SetBlackWhitePixels(pScreen);
 
-    if (!miCreateDefColormap(pScreen))
-        return FALSE;
-
-    if (!xf86HandleColormaps(pScreen, 256, 8, LoadPalette, NULL,
-                             CMAP_RELOAD_ON_MODE_SWITCH
-                             | CMAP_PALETTED_TRUECOLOR))
-        return FALSE;
-
     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
 
     if (pVia->drmmode.hwcursor) {
@@ -1588,6 +1580,14 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
     if (!xf86CrtcScreenInit(pScreen))
         return FALSE;
 
+    if (!miCreateDefColormap(pScreen))
+        return FALSE;
+
+    if (!xf86HandleColormaps(pScreen, 256, 8, LoadPalette, NULL,
+                             CMAP_RELOAD_ON_MODE_SWITCH
+                             | CMAP_PALETTED_TRUECOLOR))
+        return FALSE;
+
     xf86DPMSInit(pScreen, xf86DPMSSet, 0);
 
     if (!VIAEnterVT_internal(pScrn, 1))