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

Kevin Brace kevinbrace at kemper.freedesktop.org
Tue Apr 26 05:11:49 UTC 2016


 configure.ac      |    2 +-
 src/via_display.c |   44 ++++++++++++++++++++------------------------
 src/via_ums.h     |    5 ++---
 src/via_vgahw.c   |    4 +++-
 4 files changed, 26 insertions(+), 29 deletions(-)

New commits:
commit ac5a7921e855bd2dba81d11c7caa507efc7f5f29
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 20:55:02 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index 9490ab6..0956625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.139],
+        [0.4.140],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 7d57a96f36e38c04c56190849121fb014a7d5fef
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 20:53:19 2016 -0700

    Removing the call to viaIGA2DisplayChannel within viaDisplayInit
    
    viaIGA2DisplayChannel function should be called explicitly before
    calling viaDisplayInit function.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 5f0794a..edf2add 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -67,9 +67,7 @@ viaDisplayInit(ScrnInfoPtr pScrn)
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                         "Entered viaDisplayInit.\n"));
 
-    viaIGA2DisplayChannel(pScrn, FALSE);
     ViaCrtcMask(hwp, 0x6A, 0x00, 0x3D);
-
     hwp->writeCrtc(hwp, 0x6B, 0x00);
     hwp->writeCrtc(hwp, 0x6C, 0x00);
     hwp->writeCrtc(hwp, 0x79, 0x00);
diff --git a/src/via_vgahw.c b/src/via_vgahw.c
index 8596f1b..c0bef40 100644
--- a/src/via_vgahw.c
+++ b/src/via_vgahw.c
@@ -305,6 +305,8 @@ VIARestore(ScrnInfoPtr pScrn)
     /* Unlock extended registers. */
     hwp->writeSeq(hwp, 0x10, 0x01);
 
+    viaIGA2DisplayChannel(pScrn, FALSE);
+
     /*=* CR6A, CR6B, CR6C must be reset before restoring
          standard vga regs, or system will hang. *=*/
     /*=* TODO Check is reset IGA2 channel before disable IGA2 channel
commit 6f8a61d96acb97f13df055820c3b27447484404c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 20:48:56 2016 -0700

    Debug messages quality improvement within viaDisplayInit
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 3e2dd8f..5f0794a 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -64,7 +64,8 @@ viaDisplayInit(ScrnInfoPtr pScrn)
     VIAPtr pVia = VIAPTR(pScrn);
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaDisplayInit\n"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Entered viaDisplayInit.\n"));
 
     viaIGA2DisplayChannel(pScrn, FALSE);
     ViaCrtcMask(hwp, 0x6A, 0x00, 0x3D);
@@ -76,6 +77,9 @@ viaDisplayInit(ScrnInfoPtr pScrn)
     /* (IGA1 Timing Plus 2, added in VT3259 A3 or later) */
     if (pVia->Chipset != VIA_CLE266 && pVia->Chipset != VIA_KM400)
         ViaCrtcMask(hwp, 0x47, 0x00, 0xC8);
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Exiting viaDisplayInit.\n"));
 }
 
 /*
commit 354d5d9bcf33fa9e13c172b2c32cc5de308d685c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 20:32:46 2016 -0700

    Changing ViaDisplayInit to viaDisplayInit
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index a430a8c..3e2dd8f 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -59,12 +59,12 @@ viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State)
  * Initial settings for displays.
  */
 void
-ViaDisplayInit(ScrnInfoPtr pScrn)
+viaDisplayInit(ScrnInfoPtr pScrn)
 {
     VIAPtr pVia = VIAPTR(pScrn);
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayInit\n"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaDisplayInit\n"));
 
     viaIGA2DisplayChannel(pScrn, FALSE);
     ViaCrtcMask(hwp, 0x6A, 0x00, 0x3D);
diff --git a/src/via_ums.h b/src/via_ums.h
index f185c7f..f4c8200 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -205,7 +205,7 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
 void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State);
-void ViaDisplayInit(ScrnInfoPtr pScrn);
+void viaDisplayInit(ScrnInfoPtr pScrn);
 void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
 void ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn);
 void ViaGammaDisable(ScrnInfoPtr pScrn);
diff --git a/src/via_vgahw.c b/src/via_vgahw.c
index 1e0f808..8596f1b 100644
--- a/src/via_vgahw.c
+++ b/src/via_vgahw.c
@@ -309,7 +309,7 @@ VIARestore(ScrnInfoPtr pScrn)
          standard vga regs, or system will hang. *=*/
     /*=* TODO Check is reset IGA2 channel before disable IGA2 channel
          is necessary or it may cause some line garbage. *=*/
-    ViaDisplayInit(pScrn);
+    viaDisplayInit(pScrn);
 
     /* Gamma must be disabled before restoring palette */
     ViaGammaDisable(pScrn);
commit 7ab80529901f0c7f0b744acc91120b0368cc8ba4
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 20:02:24 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index 494cd78..9490ab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.138],
+        [0.4.139],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 824b6862ba18070b7ac270627257324837773621
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 20:01:12 2016 -0700

    Code comment improvement for viaIGA2DisplayChannel
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index b7662fe..a430a8c 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -31,7 +31,7 @@
 #include "via_driver.h"
 
 /*
- * Enables the second display channel.
+ * Controls IGA2 display channel state.
  */
 void
 viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State)
commit 71a91539bafeaea334afe0fcb8a8b6a0d1a6d087
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 19:56:21 2016 -0700

    Replacing ViaSecondDisplayChannelDisable with viaIGA2DisplayChannel
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index e9a7d32..b7662fe 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -56,22 +56,6 @@ viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State)
 }
 
 /*
- * Disables the second display channel.
- */
-void
-ViaSecondDisplayChannelDisable(ScrnInfoPtr pScrn)
-{
-    vgaHWPtr hwp = VGAHWPTR(pScrn);
-
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                     "ViaSecondDisplayChannelDisable\n"));
-
-    ViaCrtcMask(hwp, 0x6A, 0x00, 1 << 6);
-    ViaCrtcMask(hwp, 0x6A, 0x00, 1 << 7);
-    ViaCrtcMask(hwp, 0x6A, 1 << 6, 1 << 6);
-}
-
-/*
  * Initial settings for displays.
  */
 void
@@ -82,7 +66,7 @@ ViaDisplayInit(ScrnInfoPtr pScrn)
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayInit\n"));
 
-    ViaSecondDisplayChannelDisable(pScrn);
+    viaIGA2DisplayChannel(pScrn, FALSE);
     ViaCrtcMask(hwp, 0x6A, 0x00, 0x3D);
 
     hwp->writeCrtc(hwp, 0x6B, 0x00);
diff --git a/src/via_ums.h b/src/via_ums.h
index ae09b38..f185c7f 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -205,7 +205,6 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
 void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State);
-void ViaSecondDisplayChannelDisable(ScrnInfoPtr pScrn);
 void ViaDisplayInit(ScrnInfoPtr pScrn);
 void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
 void ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn);
commit 020dd2c12c69a8b7a78ba8740648e7f3e099731a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 19:51:48 2016 -0700

    Replacing viaIGA2DisplayChannelEnable with viaIGA2DisplayChannel
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 77b7fea..e9a7d32 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -34,15 +34,25 @@
  * Enables the second display channel.
  */
 void
-viaIGA2DisplayChannelEnable(ScrnInfoPtr pScrn)
+viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                     "viaIGA2DisplayChannelEnable\n"));
-    ViaCrtcMask(hwp, 0x6A, 0x00, 1 << 6);
-    ViaCrtcMask(hwp, 0x6A, 1 << 7, 1 << 7);
-    ViaCrtcMask(hwp, 0x6A, 1 << 6, 1 << 6);
+                        "Entered viaIGA2DisplayChannel.\n"));
+
+    /* 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, 0x40, 0x40);
+
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                "IGA2 Display Channel: %s\n",
+                Channel_State ? "On" : "Off");
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Exiting viaIGA2DisplayChannel.\n"));
 }
 
 /*
@@ -1608,7 +1618,7 @@ iga2_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
 
     ViaCRTCInit(pScrn);
     viaIGA2SetMode(pScrn, adjusted_mode);
-    viaIGA2DisplayChannelEnable(pScrn);
+    viaIGA2DisplayChannel(pScrn, TRUE);
 
     if (pVia->pBIOSInfo->SimultaneousEnabled)
         ViaDisplayEnableSimultaneous(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index d6b0ce2..ae09b38 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -204,7 +204,7 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
-void viaIGA2DisplayChannelEnable(ScrnInfoPtr pScrn);
+void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State);
 void ViaSecondDisplayChannelDisable(ScrnInfoPtr pScrn);
 void ViaDisplayInit(ScrnInfoPtr pScrn);
 void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
commit 3bee18389d68d38a16161e9fb7d41d8e6b9a271f
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 18:57:02 2016 -0700

    Changing ViaSecondDisplayChannelEnable to viaIGA2DisplayChannelEnable
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 89b2f76..77b7fea 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -34,12 +34,12 @@
  * Enables the second display channel.
  */
 void
-ViaSecondDisplayChannelEnable(ScrnInfoPtr pScrn)
+viaIGA2DisplayChannelEnable(ScrnInfoPtr pScrn)
 {
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                     "ViaSecondDisplayChannelEnable\n"));
+                     "viaIGA2DisplayChannelEnable\n"));
     ViaCrtcMask(hwp, 0x6A, 0x00, 1 << 6);
     ViaCrtcMask(hwp, 0x6A, 1 << 7, 1 << 7);
     ViaCrtcMask(hwp, 0x6A, 1 << 6, 1 << 6);
@@ -1608,7 +1608,7 @@ iga2_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
 
     ViaCRTCInit(pScrn);
     viaIGA2SetMode(pScrn, adjusted_mode);
-    ViaSecondDisplayChannelEnable(pScrn);
+    viaIGA2DisplayChannelEnable(pScrn);
 
     if (pVia->pBIOSInfo->SimultaneousEnabled)
         ViaDisplayEnableSimultaneous(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index a4a1a0f..d6b0ce2 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -204,7 +204,7 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
 void ViaSetUseExternalClock(vgaHWPtr hwp);
 
 /* via_display.c */
-void ViaSecondDisplayChannelEnable(ScrnInfoPtr pScrn);
+void viaIGA2DisplayChannelEnable(ScrnInfoPtr pScrn);
 void ViaSecondDisplayChannelDisable(ScrnInfoPtr pScrn);
 void ViaDisplayInit(ScrnInfoPtr pScrn);
 void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);


More information about the Openchrome-devel mailing list