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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |   18 +++++++++++++++---
 src/via_ums.h     |    2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit a4ad9caf72002b9ba53be85922342074837c5457
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 08:28:29 2016 -0500

    Version bumped to 0.4.907 (Version 0.5 RC8)
    
    Hopefully, this RC will be the Version 0.5 official release version.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 8097793..27fdfea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.906],
+        [0.4.907],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 0cbd2c440e3cbad851934d0510ed66c5a0aac3e8
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 08:26:53 2016 -0500

    Making sure PM800 family can handle multi-monitor hardware cursor
    
    It appears that PM800 family was the first to support CME video
    display engine. This engine appears to support simultaneous display
    of hardware cursor on both monitors. PM800 family includes PM800,
    PN800, PM880, CN333, and CN400 chipsets.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 2736746..1ee8934 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -3048,6 +3048,7 @@ iga1_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg)
         return;
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3090,6 +3091,7 @@ iga1_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
     }
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3115,6 +3117,7 @@ iga1_crtc_show_cursor (xf86CrtcPtr crtc)
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3141,6 +3144,7 @@ iga1_crtc_hide_cursor (xf86CrtcPtr crtc)
     CARD32 temp;
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3509,6 +3513,7 @@ iga2_crtc_set_cursor_colors(xf86CrtcPtr crtc, int bg, int fg)
         return;
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3558,6 +3563,7 @@ iga2_crtc_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
     }
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3583,6 +3589,7 @@ iga2_crtc_show_cursor(xf86CrtcPtr crtc)
     VIAPtr pVia = VIAPTR(pScrn);
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
@@ -3610,6 +3617,7 @@ iga2_crtc_hide_cursor(xf86CrtcPtr crtc)
     CARD32 temp;
 
     switch(pVia->Chipset) {
+    case VIA_PM800:
     case VIA_CX700:
     case VIA_P4M890:
     case VIA_P4M900:
commit fc1d71f9e086f23048e39e1ac8bc14e72bf2e50c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 07:45:09 2016 -0500

    Made small tweaks to viaIGA1DPMSControl
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 798927c..2736746 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -35,15 +35,19 @@
  * Controls IGA1 DPMS State.
  */
 void
-viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control)
+viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 dpmsControl)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaIGA1DPMSControl.\n"));
 
-    /* 3X5.36[5:4]: DPMS Control */
-    ViaCrtcMask(hwp, 0x36, (DPMS_Control << 4) & 0x30, 0x30);
+    /* 3X5.36[5:4] - DPMS Control
+     *               00: On
+     *               01: Stand-by
+     *               10: Suspend
+     *               11: Off */
+    ViaCrtcMask(hwp, 0x36, dpmsControl << 4, 0x30);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaIGA1DPMSControl.\n"));
diff --git a/src/via_ums.h b/src/via_ums.h
index 300432f..c9551c2 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -205,7 +205,7 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
-void viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control);
+void viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 dpmsControl);
 void viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool outputState);
 void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool channelState);
 void viaDisplayInit(ScrnInfoPtr pScrn);