[Openchrome-devel] xf86-video-openchrome: 6 commits - src/via_display.c src/via_outputs.c src/via_ums.h

Kevin Brace kevinbrace at kemper.freedesktop.org
Sat Jul 2 12:38:55 UTC 2016


 src/via_display.c |   17 ++++++++++-------
 src/via_outputs.c |   12 +++++++-----
 src/via_ums.h     |    4 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

New commits:
commit 554e8b6b3da1243670a3dcdb8a597465aa8e3dde
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 07:37:27 2016 -0500

    ViaIGA2DisplayOutput will now log the display state
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index b95ef52..798927c 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -64,6 +64,9 @@ viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool outputState)
      *             0: Screen on
      *             1: Screen off */
     ViaCrtcMask(hwp, 0x6B, outputState ? 0x00 : 0x04, 0x04);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                "IGA2 Display Output: %s\n",
+                outputState ? "On" : "Off");
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaIGA2DisplayOutput.\n"));
commit fe00a993997155aa42f3f65ea2d7aac41989c342
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 07:17:42 2016 -0500

    Accessing 3X5.47[2] to turn off analog VGA output DAC after all
    
    It was suggested that 3C5.01[5] does not turn off analog VGA
    output DAC, so the code is reverting back to what was committed in
    commit 85f99cf.
    
    Suggested-by: Luc Verhaegen <libv at skynet.be>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_outputs.c b/src/via_outputs.c
index 93b329f..0ce87fd 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -521,10 +521,11 @@ viaAnalogOutput(ScrnInfoPtr pScrn, Bool outputState)
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaAnalogOutput.\n"));
 
-    /* 3C5.01[5] - DACOFF Register
+    /* This register controls analog VGA DAC output state. */
+    /* 3X5.47[2] - DACOFF Backdoor Register
      *             0: DAC on
      *             1: DAC off */
-    ViaSeqMask(hwp, 0x01, outputState ? 0x00 : 0x20, 0x20);
+    ViaCrtcMask(hwp, 0x47, outputState ? 0x00 : 0x04, 0x04);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                 "Analog VGA Output: %s\n",
                 outputState ? "On" : "Off");
commit 8282c5adcadc3c8b91fef3bc3fcdabb493075ae8
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 07:06:20 2016 -0500

    Changing viaAnalogOutput input argument name
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_outputs.c b/src/via_outputs.c
index 5666942..93b329f 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -514,7 +514,7 @@ via_tv_init(ScrnInfoPtr pScrn)
  * (Digital to Analog Converter) output state.
  */
 static void
-viaAnalogOutput(ScrnInfoPtr pScrn, Bool displayState)
+viaAnalogOutput(ScrnInfoPtr pScrn, Bool outputState)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
@@ -524,10 +524,10 @@ viaAnalogOutput(ScrnInfoPtr pScrn, Bool displayState)
     /* 3C5.01[5] - DACOFF Register
      *             0: DAC on
      *             1: DAC off */
-    ViaSeqMask(hwp, 0x01, displayState ? 0x00 : 0x20, 0x20);
+    ViaSeqMask(hwp, 0x01, outputState ? 0x00 : 0x20, 0x20);
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                 "Analog VGA Output: %s\n",
-                displayState ? "On" : "Off");
+                outputState ? "On" : "Off");
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaAnalogOutput.\n"));
commit 17fe5eb0250cc0aeca97e74a0cb088e25347af35
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 06:57:17 2016 -0500

    Changing viaIGA2DisplayOutput input argument name
    
    Suggested-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 6f5fb73..b95ef52 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -53,7 +53,7 @@ viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control)
  * Controls IGA2 display output on or off state.
  */
 void
-viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool OutputEnable)
+viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool outputState)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
@@ -63,7 +63,7 @@ viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool OutputEnable)
     /* 3X5.6B[2] - IGA2 Screen Off
      *             0: Screen on
      *             1: Screen off */
-    ViaCrtcMask(hwp, 0x6B, OutputEnable ? 0x00 : 0x04, 0x04);
+    ViaCrtcMask(hwp, 0x6B, outputState ? 0x00 : 0x04, 0x04);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaIGA2DisplayOutput.\n"));
diff --git a/src/via_ums.h b/src/via_ums.h
index 1be1686..300432f 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -206,7 +206,7 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
 void viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control);
-void viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool OutputEnable);
+void viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool outputState);
 void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool channelState);
 void viaDisplayInit(ScrnInfoPtr pScrn);
 void ViaGammaDisable(ScrnInfoPtr pScrn);
commit e83daea3a569f9f4c5dd595f23d14dca6922cbd0
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 06:51:25 2016 -0500

    Changing viaIGA2DisplayChannel input argument name
    
    Suggested-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index eeb9e50..6f5fb73 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -73,22 +73,22 @@ viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool OutputEnable)
  * Controls IGA2 display channel state.
  */
 void
-viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State)
+viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool channelState)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaIGA2DisplayChannel.\n"));
 
-    /* 3X5.6A[7]: Second Display Channel Enable
-     * 3X5.6A[6]: Second Display Channel Reset (0 for reset) */
+    /* 3X5.6A[7] - Second Display Channel Enable
+     * 3X5.6A[6] - Second Display Channel Reset (0 for reset) */
     ViaCrtcMask(hwp, 0x6A, 0x00, 0x40);
-    ViaCrtcMask(hwp, 0x6A, Channel_State ? 0x80 : 0x00, 0x80);
+    ViaCrtcMask(hwp, 0x6A, channelState ? 0x80 : 0x00, 0x80);
     ViaCrtcMask(hwp, 0x6A, 0x40, 0x40);
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                 "IGA2 Display Channel: %s\n",
-                Channel_State ? "On" : "Off");
+                channelState ? "On" : "Off");
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Exiting viaIGA2DisplayChannel.\n"));
diff --git a/src/via_ums.h b/src/via_ums.h
index 11ff0f8..1be1686 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -207,7 +207,7 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
 /* via_display.c */
 void viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control);
 void viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool OutputEnable);
-void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State);
+void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool channelState);
 void viaDisplayInit(ScrnInfoPtr pScrn);
 void ViaGammaDisable(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
commit 6076e82ed0dafd7d4dd9522ab73124f76ada5ea3
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sat Jul 2 06:22:19 2016 -0500

    Updating via_outputs.c copyright
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_outputs.c b/src/via_outputs.c
index c180d48..5666942 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -1,5 +1,6 @@
 /*
- * Copyright 2005-2015 The Openchrome Project
+ * Copyright 2016 Kevin Brace
+ * Copyright 2005-2016 The OpenChrome Project
  *                     [http://www.freedesktop.org/wiki/Openchrome]
  * Copyright 2004-2005 The Unichrome Project  [unichrome.sf.net]
  * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.


More information about the Openchrome-devel mailing list