configure.ac | 2 +-
src/via_analog.c | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit b5fc8edfefd9664dde8a4d3cf9a9819626cb08a7
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue May 30 20:47:38 2017 -0700
Version bumped to 0.6.125
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 0330202..97d0f76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.124],
+ [0.6.125],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit b4fe24c31230261f0f718086a56ae38c1117ad35
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue May 30 20:46:09 2017 -0700
Do not assume the use of IGA1 inside viaAnalogDetectConnector
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_analog.c b/src/via_analog.c
index cbade3a..bef3b77 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -168,20 +168,15 @@ viaAnalogDetectConnector(ScrnInfoPtr pScrn)
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
Bool connectorDetected = FALSE;
- CARD8 sr01, sr40;
- CARD8 cr36, cr47;
+ CARD8 sr40, cr36, cr47;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaAnalogDetectConnector.\n"));
- sr01 = hwp->readSeq(hwp, 0x01);
sr40 = hwp->readSeq(hwp, 0x40);
cr36 = hwp->readCrtc(hwp, 0x36);
cr47 = hwp->readCrtc(hwp, 0x47);
- /* Screen On. */
- ViaSeqMask(hwp, 0x01, 0x00, BIT(5));
-
/* Turn on DAC. */
ViaCrtcMask(hwp, 0x47, 0x00, BIT(2));
@@ -225,7 +220,6 @@ viaAnalogDetectConnector(ScrnInfoPtr pScrn)
hwp->writeCrtc(hwp, 0x47, cr47);
hwp->writeCrtc(hwp, 0x36, cr36);
hwp->writeSeq(hwp, 0x40, sr40);
- hwp->writeSeq(hwp, 0x01, sr01);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaAnalogDetectConnector.\n"));
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
