[Openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_sii164.c src/via_vt1632.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Jan 6 07:44:40 UTC 2018
configure.ac | 2 +-
src/via_sii164.c | 33 ++++++++++++++++++++++++++-------
src/via_vt1632.c | 29 ++++++++++++++++++++++++-----
3 files changed, 51 insertions(+), 13 deletions(-)
New commits:
commit 2a8e5ab1ec7986ebc0cc3a3ba75d5657a806c1d4
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jan 6 01:43:24 2018 -0600
Version bumped to 0.6.166
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 7834eea..938d869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.165],
+ [0.6.166],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit d8465d7fdd91cda4ab3b0789d5e9483800759146
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jan 6 00:31:28 2018 -0600
Changed SiI 164 mode selection behavior
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_sii164.c b/src/via_sii164.c
index f8fdf29..53f12a2 100644
--- a/src/via_sii164.c
+++ b/src/via_sii164.c
@@ -341,6 +341,26 @@ via_sii164_detect(xf86OutputPtr output)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DVI connector detected.\n");
+exit:
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_sii_164_detect.\n"));
+ return status;
+}
+
+static DisplayModePtr
+via_sii164_get_modes(xf86OutputPtr output)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ xf86MonPtr pMon;
+ DisplayModePtr pDisplay_Mode = NULL;
+ I2CBusPtr pI2CBus;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
+ viaSiI164RecPtr pSiI164Rec = (viaSiI164RecPtr) output->driver_private;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered %s.\n", __func__));
+
if (pSiI164Rec->i2cBus & VIA_I2C_BUS2) {
pI2CBus = pVIADisplay->pI2CBus2;
} else if (pSiI164Rec->i2cBus & VIA_I2C_BUS3) {
@@ -355,8 +375,7 @@ via_sii164_detect(xf86OutputPtr output)
/* Is the interface type digital? */
if (pMon && DIGITAL(pMon->features.input_type)) {
xf86OutputSetEDID(output, pMon);
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "Detected a monitor connected to DVI.\n");
+ pDisplay_Mode = xf86OutputGetEDIDModes(output);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Could not obtain EDID from a monitor "
@@ -366,8 +385,8 @@ via_sii164_detect(xf86OutputPtr output)
exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_sii_164_detect.\n"));
- return status;
+ "Exiting %s.\n", __func__));
+ return pDisplay_Mode;
}
#ifdef RANDR_12_INTERFACE
@@ -403,7 +422,7 @@ const xf86OutputFuncsRec via_sii164_funcs = {
.commit = via_sii164_commit,
.mode_set = via_sii164_mode_set,
.detect = via_sii164_detect,
- .get_modes = xf86OutputGetEDIDModes,
+ .get_modes = via_sii164_get_modes,
#ifdef RANDR_12_INTERFACE
.set_property = via_sii164_set_property,
#endif
commit 572711cedab33607f6f88bdd111e46b0044d6fd5
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jan 6 00:16:42 2018 -0600
Changed VT1632(A) mode selection behavior
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index 96e3d66..7d43354 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -355,6 +355,26 @@ via_vt1632_detect(xf86OutputPtr output)
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DVI connector detected.\n");
+exit:
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_vt1632_detect.\n"));
+ return status;
+}
+
+static DisplayModePtr
+via_vt1632_get_modes(xf86OutputPtr output)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ xf86MonPtr pMon;
+ DisplayModePtr pDisplay_Mode = NULL;
+ I2CBusPtr pI2CBus;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
+ VIAVT1632Ptr pVIAVT1632 = (VIAVT1632Ptr) output->driver_private;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered %s.\n", __func__));
+
if (pVIAVT1632->i2cBus & VIA_I2C_BUS2) {
pI2CBus = pVIADisplay->pI2CBus2;
} else if (pVIAVT1632->i2cBus & VIA_I2C_BUS3) {
@@ -369,8 +389,7 @@ via_vt1632_detect(xf86OutputPtr output)
/* Is the interface type digital? */
if (pMon && DIGITAL(pMon->features.input_type)) {
xf86OutputSetEDID(output, pMon);
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "Detected a monitor connected to DVI.\n");
+ pDisplay_Mode = xf86OutputGetEDIDModes(output);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Could not obtain EDID from a monitor "
@@ -380,8 +399,8 @@ via_vt1632_detect(xf86OutputPtr output)
exit:
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_vt1632_detect.\n"));
- return status;
+ "Exiting %s.\n", __func__));
+ return pDisplay_Mode;
}
#ifdef RANDR_12_INTERFACE
@@ -415,7 +434,7 @@ const xf86OutputFuncsRec via_vt1632_funcs = {
.commit = via_vt1632_commit,
.mode_set = via_vt1632_mode_set,
.detect = via_vt1632_detect,
- .get_modes = xf86OutputGetEDIDModes,
+ .get_modes = via_vt1632_get_modes,
#ifdef RANDR_12_INTERFACE
.set_property = via_vt1632_set_property,
#endif
commit 1fa03c7911d7738b0b13b4984f6e03ab6fd6b264
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jan 5 23:44:10 2018 -0600
Update log messages inside viaSiI164DumpRegisters
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_sii164.c b/src/via_sii164.c
index d20a949..f8fdf29 100644
--- a/src/via_sii164.c
+++ b/src/via_sii164.c
@@ -42,10 +42,10 @@ viaSiI164DumpRegisters(ScrnInfoPtr pScrn, I2CDevPtr pDev)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaSiI164DumpRegisters.\n"));
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "SiI 164: dumping registers:\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Dumping SiI 164 registers.\n"));
for (i = 0; i <= 0x0f; i++) {
xf86I2CReadByte(pDev, i, &tmp);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "SiI 164: 0x%02x: 0x%02x\n", i, tmp));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "0x%02x: 0x%02x\n", i, tmp));
}
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
More information about the Openchrome-devel
mailing list