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

[Kevin Brace]

 configure.ac      |    2 +-
 src/via_display.c |   16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 0102dc1ab2800feba8b05331c727079bcb292f42
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 14:59:46 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index ea259ae..72f6778 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.136],
+        [0.4.137],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 12343dd1f0fb5fcd160fa7fea7427a26b93faf27
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 14:57:32 2016 -0700

    Fixing bad detection of the current chipset for IGA2
    
    It appears that the previous developers made a mistake when trying
    to detect the current chipset for viaIGA2SetDisplayRegister.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 245988e..b19b511 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -690,7 +690,7 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
             break;
     }
 
-    switch (pVia->ChipId) {
+    switch (pVia->Chipset) {
         case VIA_CX700:
         case VIA_K8M890:
         case VIA_P4M900:
@@ -928,7 +928,7 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
     ViaCrtcMask(hwp, 0x67, temp >> 7, 0x0C);
 
 
-    switch (pVia->ChipId) {
+    switch (pVia->Chipset) {
         case VIA_CX700:
         case VIA_K8M890:
         case VIA_P4M900:
commit 734b33c4cea7c1d84325e7a67eb824e440658ed3
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 14:56:39 2016 -0700

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

diff --git a/configure.ac b/configure.ac
index 584cf24..ea259ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.135],
+        [0.4.136],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit a2f8bd91efe52a45f3d6698aa84cb4324fbe65b5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 25 14:55:15 2016 -0700

    Fixing bad detection of the current chipset for IGA1
    
    It appears that the previous developers made a mistake when trying
    to detect the current chipset for viaIGA1SetDisplayRegister.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 4829a59..245988e 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -312,7 +312,7 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
             break;
     }
 
-    switch (pVia->ChipId) {
+    switch (pVia->Chipset) {
         case VIA_CX700:
         case VIA_K8M890:
         case VIA_P4M900:
@@ -420,7 +420,7 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
     hwp->writeCrtc(hwp, 0x16, temp);
 
     /* FIXME: check if this is really necessary here */
-    switch (pVia->ChipId) {
+    switch (pVia->Chipset) {
         case VIA_CX700:
         case VIA_K8M890:
         case VIA_P4M900:
@@ -457,7 +457,7 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
     hwp->writeSeq(hwp, 0x1C, ((temp >> 1)+1) & 0xFF);
     ViaSeqMask(hwp, 0x1D, temp >> 9, 0x03);
 
-    switch (pVia->ChipId) {
+    switch (pVia->Chipset) {
         case VIA_CX700:
         case VIA_K8M890:
         case VIA_P4M900:
commit 912be38b463fa4fb4c4cd366dfd7ac751caa2147
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Sun Apr 24 19:00:08 2016 -0700

    Added debug messages to viaIGA2SetMode.
    
    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 fcaf311..4829a59 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1008,7 +1008,8 @@ viaIGA2SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     DisplayModePtr realMode = mode;
 
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaIGA2SetMode\n"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Entered viaIGA2SetMode.\n"));
 
     viaIGA2SetDisplayRegister(pScrn, realMode);
     ViaSetSecondaryFIFO(pScrn, realMode);
@@ -1018,6 +1019,9 @@ viaIGA2SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
     ViaSetUseExternalClock(hwp);
 
     hwp->disablePalette(hwp);
+
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                        "Exiting viaIGA2SetMode.\n"));
 }
 
 /*