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

[Kevin Brace]

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

New commits:
commit 0e92c91749f75e890f029098088746670db63dbe
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jul 16 18:19:38 2019 -0700

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

diff --git a/configure.ac b/configure.ac
index 4bcca26..816ea4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.192],
+        [0.6.193],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 69dec9e343a3073b98dc482939c39144fabd4b7c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jul 16 18:13:31 2019 -0700

    Change how xf86NewOption parameter of xf86CollectOptions() is initialized
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index bc595dc..8c360f7 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -163,6 +163,9 @@ static PciChipsets VIAPciChipsets[] = {
     {-1,                -1,                 VIA_RES_UNDEF}
 };
 
+static char strEXAOptionName[] = "MigrationHeuristic";
+static char strEXAValue[] = "greedy";
+
 typedef enum
 {
 #ifdef HAVE_DEBUG
@@ -948,7 +951,6 @@ xf86CrtcConfigFuncsRec via_xf86crtc_config_funcs = {
 static Bool
 VIAPreInit(ScrnInfoPtr pScrn, int flags)
 {
-    XF86OptionPtr option = xf86NewOption("MigrationHeuristic", "greedy");
     EntityInfoPtr pEnt;
     VIAPtr pVia;
     VIADisplayPtr pVIADisplay;
@@ -961,6 +963,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
     rgb defaultWeight = {0, 0, 0};
     rgb defaultMask = {0, 0, 0};
     Gamma defaultGamma = {0.0, 0.0, 0.0};
+    XF86OptionPtr option;
     Bool status = FALSE;
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -1260,6 +1263,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
         }
     }
 
+    option = xf86NewOption(strEXAOptionName, strEXAValue);
     xf86CollectOptions(pScrn, option);
 
     if (!VIASetupDefaultOptions(pScrn)) {
commit 0e001e0a528c8af78ae2a3ddbfb18430f7e124ba
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Jul 16 17:39:02 2019 -0700

    Revert xf86CollectOptions() related commit
    
    Reverting commit f7f7d58dde59b9df559a9faaa8ff04ad1e7c5019
    (xf86NewOption parameter of xf86CollectOptions() should be null).
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 61dd084..bc595dc 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -948,6 +948,7 @@ xf86CrtcConfigFuncsRec via_xf86crtc_config_funcs = {
 static Bool
 VIAPreInit(ScrnInfoPtr pScrn, int flags)
 {
+    XF86OptionPtr option = xf86NewOption("MigrationHeuristic", "greedy");
     EntityInfoPtr pEnt;
     VIAPtr pVia;
     VIADisplayPtr pVIADisplay;
@@ -1259,7 +1260,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
         }
     }
 
-    xf86CollectOptions(pScrn, NULL);
+    xf86CollectOptions(pScrn, option);
 
     if (!VIASetupDefaultOptions(pScrn)) {
         goto fail;