configure.ac | 2
src/via_tmds.c | 140 -------------------------------------------------------
src/via_ums.h | 1
src/via_vt1632.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/via_vt1632.h | 3 +
5 files changed, 143 insertions(+), 142 deletions(-)
New commits:
commit 7a4d0be4cf349535331960380f8b2aaac832bf90
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 5 22:27:04 2016 -0700
Version bumped to 0.5.117
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index cc4bb4d..523a9c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.116],
+ [0.5.117],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit afaccb19d95981b47f3020c72e05d48fb5d3448b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Aug 5 22:26:15 2016 -0700
Moving VT1632(A) related code to via_vt1632.c
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index a6b665e..0cfc644 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -224,146 +224,6 @@ viaTMDSPower(ScrnInfoPtr pScrn, Bool On)
}
static void
-via_dvi_create_resources(xf86OutputPtr output)
-{
-}
-
-#ifdef RANDR_12_INTERFACE
-static Bool
-via_dvi_set_property(xf86OutputPtr output, Atom property,
- RRPropertyValuePtr value)
-{
- return TRUE;
-}
-
-static Bool
-via_dvi_get_property(xf86OutputPtr output, Atom property)
-{
- return FALSE;
-}
-#endif
-
-static void
-via_dvi_dpms(xf86OutputPtr output, int mode)
-{
- ScrnInfoPtr pScrn = output->scrn;
-
- switch (mode) {
- case DPMSModeOn:
- via_vt1632_power(output, TRUE);
- break;
- case DPMSModeStandby:
- case DPMSModeSuspend:
- case DPMSModeOff:
- via_vt1632_power(output, FALSE);
- break;
- default:
- break;
- }
-}
-
-static void
-via_dvi_save(xf86OutputPtr output)
-{
- via_vt1632_save(output);
-}
-
-static void
-via_dvi_restore(xf86OutputPtr output)
-{
- via_vt1632_restore(output);
-}
-
-static int
-via_dvi_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
-{
- return via_vt1632_mode_valid(output, pMode);
-}
-
-static Bool
-via_dvi_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-{
- return TRUE;
-}
-
-static void
-via_dvi_prepare(xf86OutputPtr output)
-{
-}
-
-static void
-via_dvi_commit(xf86OutputPtr output)
-{
-}
-
-static void
-via_dvi_mode_set(xf86OutputPtr output, DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-{
- ScrnInfoPtr pScrn = output->scrn;
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- via_vt1632_mode_set(output, mode, adjusted_mode);
-}
-
-static xf86OutputStatus
-via_dvi_detect(xf86OutputPtr output)
-{
- xf86OutputStatus status = XF86OutputStatusDisconnected;
- ScrnInfoPtr pScrn = output->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
- ViaVT1632Ptr Private = output->driver_private;
- xf86MonPtr mon;
-
- /* Check for the DVI presence via VT1632A first before accessing
- * I2C bus. */
- status = via_vt1632_detect(output);
- if (status == XF86OutputStatusConnected) {
-
- /* Since DVI presence was established, access the I2C bus
- * assigned to DVI. */
- mon = xf86OutputGetEDID(output, Private->VT1632I2CDev->pI2CBus);
-
- /* Is the interface type digital? */
- if (mon && DIGITAL(mon->features.input_type)) {
- xf86OutputSetEDID(output, mon);
- } else {
- status = XF86OutputStatusDisconnected;
- }
- }
-
- return status;
-}
-
-static void
-via_dvi_destroy(xf86OutputPtr output)
-{
-}
-
-const xf86OutputFuncsRec via_dvi_funcs = {
- .create_resources = via_dvi_create_resources,
-#ifdef RANDR_12_INTERFACE
- .set_property = via_dvi_set_property,
-#endif
-#ifdef RANDR_13_INTERFACE
- .get_property = via_dvi_get_property,
-#endif
- .dpms = via_dvi_dpms,
- .save = via_dvi_save,
- .restore = via_dvi_restore,
- .mode_valid = via_dvi_mode_valid,
- .mode_fixup = via_dvi_mode_fixup,
- .prepare = via_dvi_prepare,
- .commit = via_dvi_commit,
- .mode_set = via_dvi_mode_set,
- .detect = via_dvi_detect,
- .get_modes = xf86OutputGetEDIDModes,
- .destroy = via_dvi_destroy,
-};
-
-
-static void
via_tmds_create_resources(xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
diff --git a/src/via_ums.h b/src/via_ums.h
index b9bd737..8b872f2 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -240,7 +240,6 @@ void via_analog_init(ScrnInfoPtr pScrn);
void via_lvds_init(ScrnInfoPtr pScrn);
/* via_tmds.c */
-const xf86OutputFuncsRec via_dvi_funcs;
void viaTMDSPower(ScrnInfoPtr pScrn, Bool On);
void via_dvi_init(ScrnInfoPtr pScrn);
diff --git a/src/via_vt1632.c b/src/via_vt1632.c
index f3b0c6e..fc8c59b 100644
--- a/src/via_vt1632.c
+++ b/src/via_vt1632.c
@@ -227,6 +227,145 @@ via_vt1632_detect(xf86OutputPtr output)
return status;
}
+static void
+via_dvi_create_resources(xf86OutputPtr output)
+{
+}
+
+#ifdef RANDR_12_INTERFACE
+static Bool
+via_dvi_set_property(xf86OutputPtr output, Atom property,
+ RRPropertyValuePtr value)
+{
+ return TRUE;
+}
+
+static Bool
+via_dvi_get_property(xf86OutputPtr output, Atom property)
+{
+ return FALSE;
+}
+#endif
+
+static void
+via_dvi_dpms(xf86OutputPtr output, int mode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+
+ switch (mode) {
+ case DPMSModeOn:
+ via_vt1632_power(output, TRUE);
+ break;
+ case DPMSModeStandby:
+ case DPMSModeSuspend:
+ case DPMSModeOff:
+ via_vt1632_power(output, FALSE);
+ break;
+ default:
+ break;
+ }
+}
+
+static void
+via_dvi_save(xf86OutputPtr output)
+{
+ via_vt1632_save(output);
+}
+
+static void
+via_dvi_restore(xf86OutputPtr output)
+{
+ via_vt1632_restore(output);
+}
+
+static int
+via_dvi_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
+{
+ return via_vt1632_mode_valid(output, pMode);
+}
+
+static Bool
+via_dvi_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ return TRUE;
+}
+
+static void
+via_dvi_prepare(xf86OutputPtr output)
+{
+}
+
+static void
+via_dvi_commit(xf86OutputPtr output)
+{
+}
+
+static void
+via_dvi_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+ via_vt1632_mode_set(output, mode, adjusted_mode);
+}
+
+static xf86OutputStatus
+via_dvi_detect(xf86OutputPtr output)
+{
+ xf86OutputStatus status = XF86OutputStatusDisconnected;
+ ScrnInfoPtr pScrn = output->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ ViaVT1632Ptr Private = output->driver_private;
+ xf86MonPtr mon;
+
+ /* Check for the DVI presence via VT1632A first before accessing
+ * I2C bus. */
+ status = via_vt1632_detect(output);
+ if (status == XF86OutputStatusConnected) {
+
+ /* Since DVI presence was established, access the I2C bus
+ * assigned to DVI. */
+ mon = xf86OutputGetEDID(output, Private->VT1632I2CDev->pI2CBus);
+
+ /* Is the interface type digital? */
+ if (mon && DIGITAL(mon->features.input_type)) {
+ xf86OutputSetEDID(output, mon);
+ } else {
+ status = XF86OutputStatusDisconnected;
+ }
+ }
+
+ return status;
+}
+
+static void
+via_dvi_destroy(xf86OutputPtr output)
+{
+}
+
+const xf86OutputFuncsRec via_dvi_funcs = {
+ .create_resources = via_dvi_create_resources,
+#ifdef RANDR_12_INTERFACE
+ .set_property = via_dvi_set_property,
+#endif
+#ifdef RANDR_13_INTERFACE
+ .get_property = via_dvi_get_property,
+#endif
+ .dpms = via_dvi_dpms,
+ .save = via_dvi_save,
+ .restore = via_dvi_restore,
+ .mode_valid = via_dvi_mode_valid,
+ .mode_fixup = via_dvi_mode_fixup,
+ .prepare = via_dvi_prepare,
+ .commit = via_dvi_commit,
+ .mode_set = via_dvi_mode_set,
+ .detect = via_dvi_detect,
+ .get_modes = xf86OutputGetEDIDModes,
+ .destroy = via_dvi_destroy,
+};
+
Bool
viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus)
{
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index c424fac..7706ad6 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -42,6 +42,9 @@ typedef struct _ViaVT1632 {
CARD8 Register0C;
} ViaVT1632Rec, *ViaVT1632Ptr;
+
+const xf86OutputFuncsRec via_dvi_funcs;
+
void via_vt1632_power(xf86OutputPtr output, Bool powerState);
void via_vt1632_save(xf86OutputPtr output);
void via_vt1632_restore(xf86OutputPtr output);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
