configure.ac | 2 +-
src/via_lvds.c | 34 +++++++---------------------------
2 files changed, 8 insertions(+), 28 deletions(-)
New commits:
commit f20b152ec493baad331ee9efa7e715c042c25f92
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Oct 6 23:12:11 2016 -0700
Version bumped to 0.5.163
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index b0da202..6c3a832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.162],
+ [0.5.163],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit a4b1285655e569893d4cabfe391c29a519b4af3a
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Oct 6 23:10:28 2016 -0700
Rewriting of via_lvds_detect
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_lvds.c b/src/via_lvds.c
index 6b9a65e..1e054b2 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -1100,11 +1100,8 @@ via_lvds_detect(xf86OutputPtr output)
{
xf86OutputStatus status = XF86OutputStatusDisconnected;
ScrnInfoPtr pScrn = output->scrn;
- vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
ViaPanelInfoPtr panel = output->driver_private;
- CARD8 cr3b;
- CARD8 cr3b_mask;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_lvds_detect.\n"));
@@ -1119,30 +1116,13 @@ via_lvds_detect(xf86OutputPtr output)
goto exit;
}
- /* Disable reading off EDID from I2C bus 2 since it is often
- * used by DVI as well. For now, this is how DVI and LVDS FP will
- * coexist. */
-/*
- if (ViaPanelGetSizeFromDDCv1(output, &width, &height)) {
-*/
- if (FALSE) {
- status = XF86OutputStatusConnected;
- } else {
- /* Apparently this is the way VIA Technologies passes */
- /* the presence of a flat panel to the device driver */
- /* via BIOS setup. */
- if (pVia->Chipset == VIA_CLE266) {
- cr3b_mask = 0x08;
- } else {
- cr3b_mask = 0x02;
- }
-
- cr3b = hwp->readCrtc(hwp, 0x3B) & cr3b_mask;
- if (cr3b) {
- viaLVDSGetFPInfoFromScratchPad(output);
- status = XF86OutputStatusConnected;
- }
- }
+ /* For now, FP detection code will not scan the I2C bus
+ * in order to obtain EDID since it is often used by DVI
+ * as well. Hence, reading off the CRTC scratch pad register
+ * supplied by the VGA BIOS is the only method available
+ * to figure out the FP native screen resolution. */
+ viaLVDSGetFPInfoFromScratchPad(output);
+ status = XF86OutputStatusConnected;
exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
