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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_outputs.c |   23 ++++++++++++++---------
 src/via_ums.c     |   11 +++++++++++
 src/via_ums.h     |    2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

New commits:
commit 654812ab3f3e75c3af1526b0f7ad5bb72e2cfe58
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 12:48:10 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index 6dce4de..3f91a74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.105],
+        [0.4.106],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit c4cc08f85d1599f9206e65f2e44477b5a12ac82a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 12:33:48 2016 -0700

    Changing ViaDFPPower to viaTMDSPower
    
    This function is located inside via_outputs.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_outputs.c b/src/via_outputs.c
index aaf4a15..4771cc6 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -794,13 +794,13 @@ via_dvi_dpms(xf86OutputPtr output, int mode)
 
     switch (mode) {
     case DPMSModeOn:
-        ViaDFPPower(pScrn, TRUE);
+        viaTMDSPower(pScrn, TRUE);
         break;
 
     case DPMSModeStandby:
     case DPMSModeSuspend:
     case DPMSModeOff:
-        ViaDFPPower(pScrn, FALSE);
+        viaTMDSPower(pScrn, FALSE);
         break;
     }
 
@@ -1300,13 +1300,13 @@ ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode)
 }
 
 void
-ViaDFPPower(ScrnInfoPtr pScrn, Bool On)
+viaTMDSPower(ScrnInfoPtr pScrn, Bool On)
 {
 
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Entered ViaDFPPower.\n"));
+                        "Entered viaTMDSPower.\n"));
 
     /* Display Channel Select */
     ViaCrtcMask(hwp, 0xD2, 0x30, 0x30);
@@ -1323,7 +1323,7 @@ ViaDFPPower(ScrnInfoPtr pScrn, Bool On)
                 On ? "On" : "Off");
 
     DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                        "Exiting ViaDFPPower.\n"));
+                        "Exiting viaTMDSPower.\n"));
 }
 
 void
diff --git a/src/via_ums.h b/src/via_ums.h
index f768a8e..292279c 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -193,7 +193,7 @@ CARD32 ViaGetMemoryBandwidth(ScrnInfoPtr pScrn);
 CARD32 ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode);
 void ViaModeSecondaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode);
-void ViaDFPPower(ScrnInfoPtr pScrn, Bool On);
+void viaTMDSPower(ScrnInfoPtr pScrn, Bool On);
 void ViaTVPower(ScrnInfoPtr pScrn, Bool On);
 void ViaTVSave(ScrnInfoPtr pScrn);
 void ViaTVRestore(ScrnInfoPtr pScrn);
commit 4d36e6736cd36b75a5fa746981af3cd9f4fc1833
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 12:24:39 2016 -0700

    Debug messages quality improvement within ViaDFPPower
    
    Improved the quality of debug messages within ViaDFPPower function
    inside via_outputs.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_outputs.c b/src/via_outputs.c
index 77785a3..aaf4a15 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -1302,14 +1302,12 @@ ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode)
 void
 ViaDFPPower(ScrnInfoPtr pScrn, Bool On)
 {
-#ifdef HAVE_DEBUG
-    if (On)
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDFPPower: On.\n");
-    else
-        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDFPPower: Off.\n");
-#endif
+
     vgaHWPtr hwp = VGAHWPTR(pScrn);
 
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Entered ViaDFPPower.\n"));
+
     /* Display Channel Select */
     ViaCrtcMask(hwp, 0xD2, 0x30, 0x30);
 
@@ -1319,6 +1317,13 @@ ViaDFPPower(ScrnInfoPtr pScrn, Bool On)
     else
         /* Power off TMDS */
         ViaCrtcMask(hwp, 0xD2, 0x08, 0x08);
+
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                "Integrated TMDS (DVI) Power: %s\n",
+                On ? "On" : "Off");
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Exiting ViaDFPPower.\n"));
 }
 
 void
commit 86da96c7fc78d54821d8465d3098c88a655c9084
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 11:57:23 2016 -0700

    Added debug messages to UMSAccelInit
    
    This function is located inside via_ums.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_ums.c b/src/via_ums.c
index dd8df86..551e445 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -606,6 +606,9 @@ UMSAccelInit(ScreenPtr pScreen)
     VIAPtr pVia = VIAPTR(pScrn);
     Bool ret = FALSE;
 
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Entered UMSAccelInit.\n"));
+
     pVia->VQStart = 0;
     pVia->vq_bo = drm_bo_alloc(pScrn, VIA_VQ_SIZE, 16, TTM_PL_FLAG_VRAM);
     if (!pVia->vq_bo)
@@ -614,7 +617,12 @@ UMSAccelInit(ScreenPtr pScreen)
     pVia->VQStart = pVia->vq_bo->offset;
     pVia->VQEnd = pVia->vq_bo->offset + pVia->vq_bo->size;
 
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Initializing the 2D engine.\n"));
     VIAInitialize2DEngine(pScrn);
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Initializing the 3D engine.\n"));
     VIAInitialize3DEngine(pScrn);
 
     pVia->exa_sync_bo = drm_bo_alloc(pScrn, 32, 32, TTM_PL_FLAG_VRAM);
@@ -649,6 +657,9 @@ err:
         if (pVia->vq_bo)
             drm_bo_free(pScrn, pVia->vq_bo);
     }
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Exiting UMSAccelInit.\n"));
     return ret;
 }