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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 813906c6312c43ab02fd926922870df89eb67f21
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 24 10:51:25 2017 -0700

    Version bumped to 0.6.122
    
    An issue created by the previous version that led to a crash was
    resolved.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 1353593..cca7f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.6.121],
+        [0.6.122],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 0dbfb25ce60f3c5ea2d958cdc67b894058f294d9
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 24 10:49:05 2017 -0700

    Correctly handling display state in prepare and commit callbacks
    
    iga1_crtc_prepare and iga1_crtc_commit will no longer touch DPMS
    control register.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index c7fee86..09db8d3 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3745,7 +3745,7 @@ iga1_crtc_prepare(xf86CrtcPtr crtc)
                         "Entered iga1_crtc_prepare.\n"));
 
     /* Turn off IGA1. */
-    viaIGA1DPMSControl(pScrn, 0x03);
+    viaIGA1SetDisplayOutput(pScrn, FALSE);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting iga1_crtc_prepare.\n"));
@@ -3837,7 +3837,7 @@ iga1_crtc_commit(xf86CrtcPtr crtc)
         xf86_reload_cursors(crtc->scrn->pScreen);
 
     /* Turn on IGA1. */
-    viaIGA1DPMSControl(pScrn, 0x00);
+    viaIGA1SetDisplayOutput(pScrn, TRUE);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting iga1_crtc_commit.\n"));
commit 0e82a157ce69564ebdc036dcfa38fca3a3b3fe8d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed May 24 10:14:33 2017 -0700

    Fixing the incorrect reference to viaIGA1DisplayOutput
    
    This mistake was leading to a crash during the start of X Server.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 32b9761..c7fee86 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3645,10 +3645,10 @@ iga1_crtc_dpms(xf86CrtcPtr crtc, int mode)
     case DPMSModeOn:
     case DPMSModeStandby:
     case DPMSModeSuspend:
-        viaIGA1DisplayOutput(pScrn, TRUE);
+        viaIGA1SetDisplayOutput(pScrn, TRUE);
         break;
     case DPMSModeOff:
-        viaIGA1DisplayOutput(pScrn, FALSE);
+        viaIGA1SetDisplayOutput(pScrn, FALSE);
         break;
     default:
         break;