[Openchrome-devel] xf86-video-openchrome: 8 commits - configure.ac src/via_driver.c src/via_driver.h src/via_fp.c src/via_i2c.c src/via_tmds.c src/via_ums.c src/via_ums.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Mon Jun 26 20:42:03 UTC 2017
configure.ac | 2 +-
src/via_driver.c | 52 ----------------------------------------------------
src/via_driver.h | 10 ----------
src/via_fp.c | 11 +++++++----
src/via_i2c.c | 12 ++++++------
src/via_tmds.c | 5 +++--
src/via_ums.c | 31 +++++++++++++++++++++++++++++++
src/via_ums.h | 9 +++++++++
8 files changed, 57 insertions(+), 75 deletions(-)
New commits:
commit a53de224288d94584ee33b22c4c913cc9816affa
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 15:38:29 2017 -0500
Version bumped to 0.6.141
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 15f2f64..28e1a07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.140],
+ [0.6.141],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit f1ed4f2bd84bb57b3411d563bf71c1c019aea63c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 15:36:40 2017 -0500
Moving isVIANanoBook to VIADisplayRec struct
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index 399116d..48b3353 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -284,12 +284,6 @@ typedef struct _VIA {
/* Display Record Pointer */
VIADisplayPtr pVIADisplay;
- /* VIA Technologies NanoBook reference design.
- Examples include Everex CloudBook and Sylvania g netbook.
- It is also called FIC CE260 and CE261 by its ODM (Original
- Design Manufacturer) name. */
- Bool isVIANanoBook;
-
/* I2C & DDC */
I2CBusPtr pI2CBus1;
I2CBusPtr pI2CBus2;
diff --git a/src/via_fp.c b/src/via_fp.c
index 7a150b3..f7ce4f9 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -1194,7 +1194,7 @@ viaFPProbe(ScrnInfoPtr pScrn)
"SR13: 0x%02X\n", sr13));
if (cr3b & BIT(1)) {
- if (pVia->isVIANanoBook) {
+ if (pVIADisplay->isVIANanoBook) {
pVIADisplay->intFP1Presence = FALSE;
pVIADisplay->intFP1DIPort = VIA_DI_PORT_NONE;
pVIADisplay->intFP2Presence = TRUE;
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 11f797a..94d449c 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -185,6 +185,7 @@ viaTMDSIOPadSetting(ScrnInfoPtr pScrn, Bool ioPadOn)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
+ VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
CARD8 sr12, sr13, sr5a;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -223,7 +224,7 @@ viaTMDSIOPadSetting(ScrnInfoPtr pScrn, Bool ioPadOn)
* 11: DVI only */
if ((((~(sr13 & 0x80)) && (sr13 & 0x40))
|| ((sr13 & 0x80) && (sr13 & 0x40)))
- || (pVia->isVIANanoBook)) {
+ || (pVIADisplay->isVIANanoBook)) {
viaLVDS1SetIOPadSetting(pScrn, ioPadOn ? 0x03 : 0x00);
}
@@ -1011,7 +1012,7 @@ viaTMDSProbe(ScrnInfoPtr pScrn)
* VIA Technologies NanoBook reference design based products
* have their pin strappings set to a wrong setting to communicate
* the presence of DVI, so it requires special handling here. */
- if (pVia->isVIANanoBook) {
+ if (pVIADisplay->isVIANanoBook) {
pVIADisplay->intTMDSPresence = TRUE;
pVIADisplay->intTMDSDIPort = VIA_DI_PORT_TMDS;
pVIADisplay->intTMDSI2CBus = VIA_I2C_BUS2;
diff --git a/src/via_ums.c b/src/via_ums.c
index edaf21e..ba56878 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -972,9 +972,9 @@ umsPreInit(ScrnInfoPtr pScrn)
(SUBVENDOR_ID(pVia->PciInfo) == 0x1509) &&
(SUBSYS_ID(pVia->PciInfo) == 0x2D30)) {
- pVia->isVIANanoBook = TRUE;
+ pVIADisplay->isVIANanoBook = TRUE;
} else {
- pVia->isVIANanoBook = FALSE;
+ pVIADisplay->isVIANanoBook = FALSE;
}
/* Checking for OLPC XO-1.5. */
diff --git a/src/via_ums.h b/src/via_ums.h
index 0beb490..bbf7a8f 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -182,6 +182,12 @@ typedef struct _VIADISPLAY {
CARD8 mappedI2CBus;
+ /* VIA Technologies NanoBook reference design.
+ * Examples include Everex CloudBook and Sylvania g netbook.
+ * It is also called FIC CE260 and CE261 by its ODM (Original
+ * Design Manufacturer) name. */
+ Bool isVIANanoBook;
+
/* OLPC XO-1.5 */
Bool isOLPCXO15;
commit 839b22c5193bc02dc5ddf51caddb141e9a745e69
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 15:14:04 2017 -0500
Moving VIA Technologies NanoBook detection code over to umsPreInit
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index c3e4908..54bb068 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1450,22 +1450,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
ViaVgahwPrint(VGAHWPTR(pScrn)); /* Do this as early as possible */
#endif /* HAVE_DEBUG */
- /* Checking for VIA Technologies NanoBook reference design.
- Examples include Everex CloudBook and Sylvania g netbook.
- It is also called FIC CE260 and CE261 by its ODM (Original
- Design Manufacturer) name.
- This device has its strapping resistors set to a wrong
- setting to handle DVI. As a result, we need to make special
- accommodations to handle DVI properly. */
- if ((pVia->Chipset == VIA_CX700) &&
- (SUBVENDOR_ID(pVia->PciInfo) == 0x1509) &&
- (SUBSYS_ID(pVia->PciInfo) == 0x2D30)) {
-
- pVia->isVIANanoBook = TRUE;
- } else {
- pVia->isVIANanoBook = FALSE;
- }
-
/* CRTC handling */
xf86CrtcConfigInit(pScrn, &via_xf86crtc_config_funcs);
diff --git a/src/via_ums.c b/src/via_ums.c
index 5900e68..edaf21e 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -961,6 +961,22 @@ umsPreInit(ScrnInfoPtr pScrn)
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
+ /* Checking for VIA Technologies NanoBook reference design.
+ Examples include Everex CloudBook and Sylvania g netbook.
+ It is also called FIC CE260 and CE261 by its ODM (Original
+ Design Manufacturer) name.
+ This device has its strapping resistors set to a wrong
+ setting to handle DVI. As a result, we need to make special
+ accommodations to handle DVI properly. */
+ if ((pVia->Chipset == VIA_CX700) &&
+ (SUBVENDOR_ID(pVia->PciInfo) == 0x1509) &&
+ (SUBSYS_ID(pVia->PciInfo) == 0x2D30)) {
+
+ pVia->isVIANanoBook = TRUE;
+ } else {
+ pVia->isVIANanoBook = FALSE;
+ }
+
/* Checking for OLPC XO-1.5. */
if ((pVia->Chipset == VIA_VX855) &&
(SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
commit cc33c337be2aee0a3e8c7ac9c389c70f5d4e6808
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 15:09:57 2017 -0500
Moving OLPC XO-1.5 laptop detection code over to umsPreInit
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index f9fad02..5900e68 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -959,6 +959,17 @@ Bool
umsPreInit(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
+ VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
+
+ /* Checking for OLPC XO-1.5. */
+ if ((pVia->Chipset == VIA_VX855) &&
+ (SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
+ (SUBSYS_ID(pVia->PciInfo) == 0x0833)) {
+
+ pVIADisplay->isOLPCXO15 = TRUE;
+ } else {
+ pVIADisplay->isOLPCXO15 = FALSE;
+ }
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
@@ -1067,16 +1078,6 @@ umsCrtcInit(ScrnInfoPtr pScrn)
}
}
- /* Checking for OLPC XO-1.5. */
- if ((pVia->Chipset == VIA_VX855) &&
- (SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
- (SUBSYS_ID(pVia->PciInfo) == 0x0833)) {
-
- pVIADisplay->isOLPCXO15 = TRUE;
- } else {
- pVIADisplay->isOLPCXO15 = FALSE;
- }
-
if (pVIADisplay->isOLPCXO15) {
pVia->I2CDevices &= ~VIA_I2C_BUS2;
}
commit 58570a730eef258e55b22ac7d669bb630165b0d4
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 15:07:46 2017 -0500
Moving IsOLPCXO15 to VIADisplayRec struct and renaming it to isOLPCXO15
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index 6daa4cd..399116d 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -290,9 +290,6 @@ typedef struct _VIA {
Design Manufacturer) name. */
Bool isVIANanoBook;
- /* OLPC XO-1.5 */
- Bool IsOLPCXO15;
-
/* I2C & DDC */
I2CBusPtr pI2CBus1;
I2CBusPtr pI2CBus2;
diff --git a/src/via_fp.c b/src/via_fp.c
index 487ce93..7a150b3 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -924,13 +924,14 @@ via_fp_detect(xf86OutputPtr output)
xf86OutputStatus status = XF86OutputStatusDisconnected;
I2CBusPtr pI2CBus;
VIAPtr pVia = VIAPTR(pScrn);
+ VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
VIAFPPtr pVIAFP = (VIAFPPtr) output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_fp_detect.\n"));
/* Hardcode panel size for the OLPC XO-1.5. */
- if (pVia->IsOLPCXO15) {
+ if (pVIADisplay->isOLPCXO15) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Setting up OLPC XO-1.5 flat panel.\n");
pVIAFP->NativeWidth = 1200;
@@ -991,6 +992,8 @@ via_fp_get_modes(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
DisplayModePtr pDisplay_Mode = NULL;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
VIAFPPtr pVIAFP = (VIAFPPtr) output->driver_private;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -1005,7 +1008,7 @@ via_fp_get_modes(xf86OutputPtr output)
if (pVIAFP->NativeWidth && pVIAFP->NativeHeight) {
VIAPtr pVia = VIAPTR(pScrn);
- if (pVia->IsOLPCXO15) {
+ if (pVIADisplay->isOLPCXO15) {
pDisplay_Mode = xf86DuplicateMode(&OLPCMode);
} else {
pDisplay_Mode = xf86CVTMode(pVIAFP->NativeWidth, pVIAFP->NativeHeight,
@@ -1310,7 +1313,7 @@ viaFPInit(ScrnInfoPtr pScrn)
output->interlaceAllowed = FALSE;
output->doubleScanAllowed = FALSE;
- if (pVia->IsOLPCXO15) {
+ if (pVIADisplay->isOLPCXO15) {
output->mm_height = 152;
output->mm_width = 114;
}
diff --git a/src/via_ums.c b/src/via_ums.c
index 8f6317e..f9fad02 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1072,12 +1072,12 @@ umsCrtcInit(ScrnInfoPtr pScrn)
(SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
(SUBSYS_ID(pVia->PciInfo) == 0x0833)) {
- pVia->IsOLPCXO15 = TRUE;
+ pVIADisplay->isOLPCXO15 = TRUE;
} else {
- pVia->IsOLPCXO15 = FALSE;
+ pVIADisplay->isOLPCXO15 = FALSE;
}
- if (pVia->IsOLPCXO15) {
+ if (pVIADisplay->isOLPCXO15) {
pVia->I2CDevices &= ~VIA_I2C_BUS2;
}
diff --git a/src/via_ums.h b/src/via_ums.h
index 60c2bba..0beb490 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -182,6 +182,9 @@ typedef struct _VIADISPLAY {
CARD8 mappedI2CBus;
+ /* OLPC XO-1.5 */
+ Bool isOLPCXO15;
+
xf86OutputPtr tv;
CARD32 Clock; /* register value for the dotclock */
commit b0c6a38f533abac7076b0838428f85edbdaf481a
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 14:02:44 2017 -0500
Moving OLPC XO-1.5 laptop detection code over to umsCrtcInit
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index b5c8787..c3e4908 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1466,20 +1466,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
pVia->isVIANanoBook = FALSE;
}
- /* Checking for OLPC XO-1.5. */
- if ((pVia->Chipset == VIA_VX855) &&
- (SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
- (SUBSYS_ID(pVia->PciInfo) == 0x0833)) {
-
- pVia->IsOLPCXO15 = TRUE;
- } else {
- pVia->IsOLPCXO15 = FALSE;
- }
-
- if (pVia->IsOLPCXO15) {
- pVia->I2CDevices &= ~VIA_I2C_BUS2;
- }
-
/* CRTC handling */
xf86CrtcConfigInit(pScrn, &via_xf86crtc_config_funcs);
diff --git a/src/via_ums.c b/src/via_ums.c
index b49a368..8f6317e 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1067,6 +1067,20 @@ umsCrtcInit(ScrnInfoPtr pScrn)
}
}
+ /* Checking for OLPC XO-1.5. */
+ if ((pVia->Chipset == VIA_VX855) &&
+ (SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
+ (SUBSYS_ID(pVia->PciInfo) == 0x0833)) {
+
+ pVia->IsOLPCXO15 = TRUE;
+ } else {
+ pVia->IsOLPCXO15 = FALSE;
+ }
+
+ if (pVia->IsOLPCXO15) {
+ pVia->I2CDevices &= ~VIA_I2C_BUS2;
+ }
+
if (pVia->drmmode.hwcursor) {
if (!xf86LoadSubModule(pScrn, "ramdac"))
return FALSE;
commit 600d28b26f9978a5ba61206f5df8d9379ed45c8e
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 10:45:24 2017 -0500
Removed I2CScan option
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index ec4854d..b5c8787 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -167,7 +167,6 @@ typedef enum
#ifdef HAVE_DEBUG
OPTION_PRINTVGAREGS,
OPTION_PRINTTVREGS,
- OPTION_I2CSCAN,
#endif
OPTION_NOACCEL,
OPTION_EXA_NOCOMPOSITE,
@@ -195,7 +194,6 @@ static OptionInfoRec VIAOptions[] = {
#ifdef HAVE_DEBUG /* Don't document these three. */
{OPTION_PRINTVGAREGS, "PrintVGARegs", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_PRINTTVREGS, "PrintTVRegs", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_I2CSCAN, "I2CScan", OPTV_BOOLEAN, {0}, FALSE},
#endif
{OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_EXA_NOCOMPOSITE, "ExaNoComposite", OPTV_BOOLEAN, {0}, FALSE},
@@ -1450,12 +1448,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
pVia->PrintVGARegs ? "" : "not ");
if (pVia->PrintVGARegs)
ViaVgahwPrint(VGAHWPTR(pScrn)); /* Do this as early as possible */
-
- pVia->I2CScan = FALSE;
- from = xf86GetOptValBool(VIAOptions, OPTION_I2CSCAN, &pVia->I2CScan)
- ? X_CONFIG : X_DEFAULT;
- xf86DrvMsg(pScrn->scrnIndex, from, "Will %sscan I2C buses.\n",
- pVia->I2CScan ? "" : "not ");
#endif /* HAVE_DEBUG */
/* Checking for VIA Technologies NanoBook reference design.
diff --git a/src/via_driver.h b/src/via_driver.h
index e2c4b16..6daa4cd 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -356,7 +356,6 @@ typedef struct _VIA {
Bool DumpVGAROM;
Bool PrintVGARegs;
Bool PrintTVRegs;
- Bool I2CScan;
#endif /* HAVE_DEBUG */
video_via_regs* VideoRegs;
diff --git a/src/via_i2c.c b/src/via_i2c.c
index 7425a90..6beae8e 100644
--- a/src/via_i2c.c
+++ b/src/via_i2c.c
@@ -486,12 +486,12 @@ ViaI2CInit(ScrnInfoPtr pScrn)
pVia->pI2CBus3 = ViaI2CBus3Init(pScrn);
#ifdef HAVE_DEBUG
- if (pVia->I2CScan) {
- if (pVia->pI2CBus2)
- ViaI2CScan(pVia->pI2CBus2);
- if (pVia->pI2CBus3)
- ViaI2CScan(pVia->pI2CBus3);
- }
+ if (pVia->pI2CBus1)
+ ViaI2CScan(pVia->pI2CBus1);
+ if (pVia->pI2CBus2)
+ ViaI2CScan(pVia->pI2CBus2);
+ if (pVia->pI2CBus3)
+ ViaI2CScan(pVia->pI2CBus3);
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit 9b9dfb598f7830987603987c6c6819f420309282
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jun 26 10:27:27 2017 -0500
Removed I2CDevices option
This option is obsolete.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index e11b7ca..ec4854d 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -176,7 +176,6 @@ typedef enum
OPTION_SHADOW_FB,
OPTION_ROTATION_TYPE,
OPTION_ROTATE,
- OPTION_I2CDEVICES,
OPTION_CENTER,
OPTION_TVDOTCRAWL,
OPTION_TVTYPE,
@@ -217,7 +216,6 @@ static OptionInfoRec VIAOptions[] = {
{OPTION_DISABLE_XV_BW_CHECK, "DisableXvBWCheck", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_MAX_DRIMEM, "MaxDRIMem", OPTV_INTEGER, {0}, FALSE},
{OPTION_AGPMEM, "AGPMem", OPTV_INTEGER, {0}, FALSE},
- {OPTION_I2CDEVICES, "I2CDevices", OPTV_ANYSTR, {0}, FALSE},
{-1, NULL, OPTV_NONE, {0}, FALSE}
};
@@ -1476,7 +1474,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
pVia->isVIANanoBook = FALSE;
}
-
/* Checking for OLPC XO-1.5. */
if ((pVia->Chipset == VIA_VX855) &&
(SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&
@@ -1487,17 +1484,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
pVia->IsOLPCXO15 = FALSE;
}
- /* I2CDevices Option for I2C Initialization */
- if ((s = xf86GetOptValString(VIAOptions, OPTION_I2CDEVICES))) {
- pVia->I2CDevices = 0;
- if (strstr(s, "Bus1"))
- pVia->I2CDevices |= VIA_I2C_BUS1;
- if (strstr(s, "Bus2"))
- pVia->I2CDevices |= VIA_I2C_BUS2;
- if (strstr(s, "Bus3"))
- pVia->I2CDevices |= VIA_I2C_BUS3;
- }
-
if (pVia->IsOLPCXO15) {
pVia->I2CDevices &= ~VIA_I2C_BUS2;
}
More information about the Openchrome-devel
mailing list