[Openchrome-devel] xf86-video-openchrome: 5 commits - configure.ac src/via_analog.c src/via_driver.h src/via_lvds.c src/via_outputs.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Thu Aug 25 11:06:01 UTC 2016
configure.ac | 2 +-
src/via_analog.c | 9 ++++++++-
src/via_driver.h | 6 ++++++
src/via_lvds.c | 9 ++++++++-
src/via_outputs.c | 6 ++++++
5 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit adf0d6c31f686706bc92f7ce3770d6a864fb385a
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Aug 25 04:05:15 2016 -0700
Version bumped to 0.5.140
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index ad96eed..4daecbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.139],
+ [0.5.140],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit aaa432cb5312f4bef85261c481cae5af32822cc6
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Aug 25 03:58:24 2016 -0700
Changing xrandr designation for a flat panel from LVDS to FP
The term LVDS (Low Voltage Differential Signaling) is a technical
term for signal transmission. It is a confusing word for describing
a flat panel. The term, FP (Flat Panel), will be the new term used
from now on.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_lvds.c b/src/via_lvds.c
index fc6ebc4..7991cd5 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -1253,9 +1253,9 @@ via_lvds_init(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, from, "LVDS-0 : DVI Center is %s.\n",
Panel->Center ? "enabled" : "disabled");
- /* The code to dynamically designate a particular LVDS (i.e., LVDS-1,
- * LVDS-2, etc.) for xrandr was borrowed from xf86-video-r128 DDX. */
- sprintf(outputNameBuffer, "LVDS-%d", (pVia->numberFP + 1));
+ /* The code to dynamically designate a particular FP (i.e., FP-1,
+ * FP-2, etc.) for xrandr was borrowed from xf86-video-r128 DDX. */
+ sprintf(outputNameBuffer, "FP-%d", (pVia->numberFP + 1));
output = xf86OutputCreate(pScrn, &via_lvds_funcs, outputNameBuffer);
if (output) {
commit 2bcae133f067e5eba601f72322e5fb6cfc3290c7
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Aug 25 03:54:44 2016 -0700
Designating FP dynamically for xrandr
The code was updated so that FP (Flat Panel) designation for xrandr
will be assigned dynamically. The code to facilitate this was
borrowed from xf86-video-r128 DDX.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index dab66de..5a2054c 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -382,6 +382,9 @@ typedef struct _VIA {
/* Keeping track of the number of DVI connectors. */
unsigned int numberDVI;
+
+ /* Keeping track of the number of FP (Flat Panel) connectors. */
+ unsigned int numberFP;
} VIARec, *VIAPtr;
#define VIAPTR(p) ((VIAPtr)((p)->driverPrivate))
diff --git a/src/via_lvds.c b/src/via_lvds.c
index fa81adb..fc6ebc4 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -1221,6 +1221,7 @@ via_lvds_init(ScrnInfoPtr pScrn)
vgaHWPtr hwp = VGAHWPTR(pScrn);
CARD8 cr3b = 0x00;
CARD8 cr3b_mask = 0x00;
+ char outputNameBuffer[32];
if (!Panel)
return;
@@ -1252,7 +1253,10 @@ via_lvds_init(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, from, "LVDS-0 : DVI Center is %s.\n",
Panel->Center ? "enabled" : "disabled");
- output = xf86OutputCreate(pScrn, &via_lvds_funcs, "LVDS-1");
+ /* The code to dynamically designate a particular LVDS (i.e., LVDS-1,
+ * LVDS-2, etc.) for xrandr was borrowed from xf86-video-r128 DDX. */
+ sprintf(outputNameBuffer, "LVDS-%d", (pVia->numberFP + 1));
+ output = xf86OutputCreate(pScrn, &via_lvds_funcs, outputNameBuffer);
if (output) {
output->driver_private = Panel;
@@ -1267,6 +1271,9 @@ via_lvds_init(ScrnInfoPtr pScrn)
output->interlaceAllowed = FALSE;
output->doubleScanAllowed = FALSE;
+ /* Increment the number of FP connectors. */
+ pVia->numberFP++;
+
if (pVia->IsOLPCXO15) {
output->mm_height = 152;
output->mm_width = 114;
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 33b51cb..a61a54d 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -348,6 +348,9 @@ viaOutputDetect(ScrnInfoPtr pScrn)
/* Initialize the number of DVI connectors. */
pVia->numberDVI = 0;
+ /* Initialize the number of FP connectors. */
+ pVia->numberFP = 0;
+
/* Read off the VIA Technologies IGP pin strapping for
display detection purposes. */
viaProbePinStrapping(pScrn);
commit 6fe9fef6b49a69e7e8ed6d50e98f2dcb69341cfc
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Aug 25 03:38:59 2016 -0700
Forgot to increment the number of VGA connectors
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_analog.c b/src/via_analog.c
index 6a8abf6..1608d0f 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -386,6 +386,9 @@ via_analog_init(ScrnInfoPtr pScrn)
output->doubleScanAllowed = FALSE;
pBIOSInfo->analog = output;
+ /* Increment the number of analog VGA connectors. */
+ pVia->numberVGA++;
+
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting via_analog_init.\n"));
}
commit 58f9d89aed55aa41b878943a91abfb06281fd951
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Aug 25 03:28:53 2016 -0700
Designating analog VGA dynamically for xrandr
The code was updated so that analog VGA designation for xrandr will be
assigned dynamically. The code to facilitate this was borrowed from
xf86-video-r128 DDX.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_analog.c b/src/via_analog.c
index ed73194..6a8abf6 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -353,6 +353,7 @@ via_analog_init(ScrnInfoPtr pScrn)
VIAPtr pVia = VIAPTR(pScrn);
VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
xf86OutputPtr output = NULL;
+ char outputNameBuffer[32];
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_analog_init.\n"));
@@ -365,7 +366,10 @@ via_analog_init(ScrnInfoPtr pScrn)
return;
}
- output = xf86OutputCreate(pScrn, &via_analog_funcs, "VGA-1");
+ /* The code to dynamically designate the output name for
+ * xrandr was borrowed from xf86-video-r128 DDX. */
+ sprintf(outputNameBuffer, "VGA-%d", (pVia->numberVGA + 1));
+ output = xf86OutputCreate(pScrn, &via_analog_funcs, outputNameBuffer);
/* While there are two (2) display controllers registered with the
* X.Org Server, it is often desirable to fix the analog VGA output
diff --git a/src/via_driver.h b/src/via_driver.h
index 21ec0b9..dab66de 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -377,6 +377,9 @@ typedef struct _VIA {
video_via_regs* VideoRegs;
+ /* Keeping track of the number of analog VGA connectors. */
+ unsigned int numberVGA;
+
/* Keeping track of the number of DVI connectors. */
unsigned int numberDVI;
} VIARec, *VIAPtr;
diff --git a/src/via_outputs.c b/src/via_outputs.c
index e6cc824..33b51cb 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -342,6 +342,9 @@ viaOutputDetect(ScrnInfoPtr pScrn)
pBIOSInfo->analog = NULL;
+ /* Initialize the number of VGA connectors. */
+ pVia->numberVGA = 0;
+
/* Initialize the number of DVI connectors. */
pVia->numberDVI = 0;
More information about the Openchrome-devel
mailing list