configure.ac | 2
src/Makefile.am | 1
src/via_outputs.c | 429 -------------------------------------------------
src/via_tv.c | 470 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/via_ums.h | 12 -
5 files changed, 478 insertions(+), 436 deletions(-)
New commits:
commit 30b7ebb34a76caefad074b7167bfae38c0e2d402
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jul 21 20:49:54 2016 -0700
Version bumped to 0.5.110
This version moves TV output initialization and management code
to via_tv.c.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 198e5c9..caf899c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.5.109],
+ [0.5.110],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 308e36e58dba2bc9fcf0de3070a9c5cad6119d9c
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jul 21 20:48:18 2016 -0700
Added a new file called via_tv.c
This module handles TV output initialization and management. The
functions came from via_outputs.c.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index bdfa196..82224d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,7 @@ openchrome_drv_la_SOURCES = \
via_priv.h \
via_regs.h \
via_tmds.c \
+ via_tv.c \
via_xv_overlay.c \
via_xv_overlay.h \
via_ums.c \
diff --git a/src/via_outputs.c b/src/via_outputs.c
index c297359..9b88cb4 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -81,435 +81,6 @@ ViaPrintMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
/*
- *
- * TV specific code.
- *
- */
-void
-ViaTVSave(ScrnInfoPtr pScrn)
-{
- VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
-
- if (pBIOSInfo->TVSave)
- pBIOSInfo->TVSave(pScrn);
-}
-
-void
-ViaTVRestore(ScrnInfoPtr pScrn)
-{
- VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
-
- if (pBIOSInfo->TVRestore)
- pBIOSInfo->TVRestore(pScrn);
-}
-
-static Bool
-ViaTVDACSense(ScrnInfoPtr pScrn)
-{
- VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
-
- if (pBIOSInfo->TVDACSense)
- return pBIOSInfo->TVDACSense(pScrn);
- return FALSE;
-}
-
-static void
-ViaTVSetMode(xf86CrtcPtr crtc, DisplayModePtr mode)
-{
- ScrnInfoPtr pScrn = crtc->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-
- if (pBIOSInfo->TVModeI2C)
- pBIOSInfo->TVModeI2C(pScrn, mode);
-
- if (pBIOSInfo->TVModeCrtc)
- pBIOSInfo->TVModeCrtc(crtc, mode);
-
- /* TV reset. */
- xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x1D, 0x00);
- xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x1D, 0x80);
-}
-
-void
-ViaTVPower(ScrnInfoPtr pScrn, Bool On)
-{
- VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
-
-#ifdef HAVE_DEBUG
- if (On)
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaTVPower: On.\n");
- else
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaTVPower: Off.\n");
-#endif
-
- if (pBIOSInfo->TVPower)
- pBIOSInfo->TVPower(pScrn, On);
-}
-
-#ifdef HAVE_DEBUG
-void
-ViaTVPrintRegs(ScrnInfoPtr pScrn)
-{
- VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
-
- if (pBIOSInfo->TVPrintRegs)
- pBIOSInfo->TVPrintRegs(pScrn);
-}
-#endif /* HAVE_DEBUG */
-
-static void
-via_tv_create_resources(xf86OutputPtr output)
-{
-}
-
-#ifdef RANDR_12_INTERFACE
-static Bool
-via_tv_set_property(xf86OutputPtr output, Atom property,
- RRPropertyValuePtr value)
-{
- return TRUE;
-}
-
-static Bool
-via_tv_get_property(xf86OutputPtr output, Atom property)
-{
- return FALSE;
-}
-#endif
-
-static void
-via_tv_dpms(xf86OutputPtr output, int mode)
-{
- ScrnInfoPtr pScrn = output->scrn;
-
- switch (mode) {
- case DPMSModeOn:
- ViaTVPower(pScrn, TRUE);
- break;
-
- case DPMSModeStandby:
- case DPMSModeSuspend:
- case DPMSModeOff:
- ViaTVPower(pScrn, FALSE);
- break;
- }
-}
-
-static void
-via_tv_save(xf86OutputPtr output)
-{
- ScrnInfoPtr pScrn = output->scrn;
-
- ViaTVSave(pScrn);
-}
-
-static void
-via_tv_restore(xf86OutputPtr output)
-{
- ScrnInfoPtr pScrn = output->scrn;
-
- ViaTVRestore(pScrn);
-}
-
-static int
-via_tv_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
-{
- ScrnInfoPtr pScrn = output->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
- int ret = MODE_OK;
-
- if (!ViaModeDotClockTranslate(pScrn, pMode))
- return MODE_NOCLOCK;
-
- return ret;
-}
-
-static Bool
-via_tv_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-{
- return TRUE;
-}
-
-static void
-via_tv_prepare(xf86OutputPtr output)
-{
- via_tv_dpms(output, DPMSModeOff);
-}
-
-static void
-via_tv_commit(xf86OutputPtr output)
-{
- via_tv_dpms(output, DPMSModeOn);
-}
-
-static void
-ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayEnableDVO, port:
%d\n",
- port));
- switch (port) {
- case VIA_DI_PORT_DVP0:
- ViaSeqMask(hwp, 0x1E, 0xC0, 0xC0);
- break;
- case VIA_DI_PORT_DVP1:
- ViaSeqMask(hwp, 0x1E, 0x30, 0x30);
- break;
- }
-}
-
-static void
-ViaDisplayDisableDVO(ScrnInfoPtr pScrn, int port)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayDisableDVO, port:
%d\n",
- port));
- switch (port) {
- case VIA_DI_PORT_DVP0:
- ViaSeqMask(hwp, 0x1E, 0x00, 0xC0);
- break;
- case VIA_DI_PORT_DVP1:
- ViaSeqMask(hwp, 0x1E, 0x00, 0x30);
- break;
- }
-}
-
-static void
-ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, int iga)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- int regNum;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplaySetStreamOnDVO,
port: %d\n",
- port));
-
- switch (port) {
- case VIA_DI_PORT_DVP0:
- regNum = 0x96;
- break;
- case VIA_DI_PORT_DVP1:
- regNum = 0x9B;
- break;
- case VIA_DI_PORT_DFPLOW:
- regNum = 0x97;
- break;
- case VIA_DI_PORT_DFPHIGH:
- regNum = 0x99;
- break;
- }
-
- if (!iga)
- ViaCrtcMask(hwp, regNum, 0x00, 0x10);
- else
- ViaCrtcMask(hwp, regNum, 0x10, 0x10);
-}
-
-static void
-via_tv_mode_set(xf86OutputPtr output, DisplayModePtr mode,
- DisplayModePtr adjusted_mode)
-{
- ScrnInfoPtr pScrn = output->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-
- /* TV on FirstCrtc */
- if (output->crtc) {
- drmmode_crtc_private_ptr iga = output->crtc->driver_private;
-
- ViaDisplaySetStreamOnDVO(pScrn, pBIOSInfo->TVDIPort, iga->index);
- }
- ViaDisplayEnableDVO(pScrn, pBIOSInfo->TVDIPort);
-
- ViaTVSetMode(output->crtc, adjusted_mode);
-
- pVia->FirstInit = FALSE;
-}
-
-static xf86OutputStatus
-via_tv_detect(xf86OutputPtr output)
-{
- xf86OutputStatus status = XF86OutputStatusDisconnected;
- ScrnInfoPtr pScrn = output->scrn;
-
- if (ViaTVDACSense(pScrn))
- status = XF86OutputStatusConnected;
- return status;
-}
-
-static DisplayModePtr
-via_tv_get_modes(xf86OutputPtr output)
-{
- DisplayModePtr modes = NULL, mode = NULL;
- ScrnInfoPtr pScrn = output->scrn;
- VIAPtr pVia = VIAPTR(pScrn);
- int i;
-
- for (i = 0; i < pVia->pBIOSInfo->TVNumModes; i++) {
- mode = xf86DuplicateMode(&pVia->pBIOSInfo->TVModes[i]);
- modes = xf86ModesAdd(modes, mode);
- }
- return modes;
-}
-
-static void
-via_tv_destroy(xf86OutputPtr output)
-{
-}
-
-static const xf86OutputFuncsRec via_tv_funcs = {
- .create_resources = via_tv_create_resources,
-#ifdef RANDR_12_INTERFACE
- .set_property = via_tv_set_property,
-#endif
-#ifdef RANDR_13_INTERFACE
- .get_property = via_tv_get_property,
-#endif
- .dpms = via_tv_dpms,
- .save = via_tv_save,
- .restore = via_tv_restore,
- .mode_valid = via_tv_mode_valid,
- .mode_fixup = via_tv_mode_fixup,
- .prepare = via_tv_prepare,
- .commit = via_tv_commit,
- .mode_set = via_tv_mode_set,
- .detect = via_tv_detect,
- .get_modes = via_tv_get_modes,
- .destroy = via_tv_destroy,
-};
-
-/*
- *
- */
-static Bool
-via_tv_init(ScrnInfoPtr pScrn)
-{
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
- xf86OutputPtr output = NULL;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Entered via_tv_init.\n"));
-
- /* preset some pBIOSInfo TV related values -- move up */
- pBIOSInfo->TVEncoder = VIA_NONETV;
- pBIOSInfo->TVI2CDev = NULL;
- pBIOSInfo->TVSave = NULL;
- pBIOSInfo->TVRestore = NULL;
- pBIOSInfo->TVDACSense = NULL;
- pBIOSInfo->TVModeValid = NULL;
- pBIOSInfo->TVModeI2C = NULL;
- pBIOSInfo->TVModeCrtc = NULL;
- pBIOSInfo->TVPower = NULL;
- pBIOSInfo->TVModes = NULL;
- pBIOSInfo->TVPrintRegs = NULL;
- pBIOSInfo->LCDPower = NULL;
- pBIOSInfo->TVNumRegs = 0;
-
- /*
- * On an SK43G (KM400/Ch7011), false positive detections at a VT162x
- * chip were observed, so try to detect the Ch7011 first.
- */
- if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, 0xEC))
- pBIOSInfo->TVI2CDev = ViaCH7xxxDetect(pScrn, pVia->pI2CBus2, 0xEC);
- else if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, 0x40))
- pBIOSInfo->TVI2CDev = ViaVT162xDetect(pScrn, pVia->pI2CBus2, 0x40);
- else if (pVia->pI2CBus3 && xf86I2CProbeAddress(pVia->pI2CBus3, 0x40))
- pBIOSInfo->TVI2CDev = ViaVT162xDetect(pScrn, pVia->pI2CBus3, 0x40);
- else if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, 0xEA))
- pBIOSInfo->TVI2CDev = ViaCH7xxxDetect(pScrn, pVia->pI2CBus2, 0xEA);
- else if (pVia->pI2CBus3 && xf86I2CProbeAddress(pVia->pI2CBus3, 0xEA))
- pBIOSInfo->TVI2CDev = ViaCH7xxxDetect(pScrn, pVia->pI2CBus3, 0xEA);
-
- if (!pBIOSInfo->TVI2CDev) {
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "Did not detect a TV encoder.\n");
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_tv_init.\n"));
-
- return FALSE;
- }
-
- switch (pBIOSInfo->TVEncoder) {
- case VIA_VT1621:
- case VIA_VT1622:
- case VIA_VT1623:
- case VIA_VT1625:
- ViaVT162xInit(pScrn);
- break;
- case VIA_CH7011:
- case VIA_CH7019A:
- case VIA_CH7019B:
- ViaCH7xxxInit(pScrn);
- break;
- default:
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Was not able to initialize a known TV encoder.\n");
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_tv_init.\n"));
- return FALSE;
- break;
- }
-
- if (!pBIOSInfo->TVSave || !pBIOSInfo->TVRestore
- || !pBIOSInfo->TVDACSense || !pBIOSInfo->TVModeValid
- || !pBIOSInfo->TVModeI2C || !pBIOSInfo->TVModeCrtc
- || !pBIOSInfo->TVPower || !pBIOSInfo->TVModes
- || !pBIOSInfo->TVPrintRegs) {
-
- xf86DestroyI2CDevRec(pBIOSInfo->TVI2CDev, TRUE);
-
- pBIOSInfo->TVI2CDev = NULL;
- pBIOSInfo->TVOutput = TVOUTPUT_NONE;
- pBIOSInfo->TVEncoder = VIA_NONETV;
- pBIOSInfo->TVI2CDev = NULL;
- pBIOSInfo->TVSave = NULL;
- pBIOSInfo->TVRestore = NULL;
- pBIOSInfo->TVDACSense = NULL;
- pBIOSInfo->TVModeValid = NULL;
- pBIOSInfo->TVModeI2C = NULL;
- pBIOSInfo->TVModeCrtc = NULL;
- pBIOSInfo->TVPower = NULL;
- pBIOSInfo->TVModes = NULL;
- pBIOSInfo->TVPrintRegs = NULL;
- pBIOSInfo->TVNumRegs = 0;
-
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "TV encoder was not properly initialized.\n");
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_tv_init.\n"));
- return FALSE;
- }
-
- output = xf86OutputCreate(pScrn, &via_tv_funcs, "TV-1");
- pVia->FirstInit = TRUE;
-
- if (output) {
- /* Allow tv output on both crtcs, set bit 0 and 1. */
- output->possible_crtcs = 0x3;
- } else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to register TV-1.\n");
- }
-
- pBIOSInfo->tv = output;
- /* Save now */
- pBIOSInfo->TVSave(pScrn);
-
-#ifdef HAVE_DEBUG
- if (VIAPTR(pScrn)->PrintTVRegs)
- pBIOSInfo->TVPrintRegs(pScrn);
-#endif
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Exiting via_tv_init.\n"));
- return TRUE;
-}
-
-/*
* Reads off the VIA Technologies IGP pin strapping for
* display detection purposes.
*/
diff --git a/src/via_tv.c b/src/via_tv.c
new file mode 100644
index 0000000..276543c
--- /dev/null
+++ b/src/via_tv.c
@@ -0,0 +1,470 @@
+/*
+ * Copyright 2005-2016 The OpenChrome Project
+ * [http://www.freedesktop.org/wiki/Openchrome]
+ * Copyright 2004-2005 The Unichrome Project [unichrome.sf.net]
+ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * via_tv.c
+ *
+ * Handles the initialization and management of TV output related
+ * resources.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "via_driver.h"
+#include <unistd.h>
+
+/*
+ *
+ * TV specific code.
+ *
+ */
+static void
+ViaTVSave(ScrnInfoPtr pScrn)
+{
+ VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
+
+ if (pBIOSInfo->TVSave)
+ pBIOSInfo->TVSave(pScrn);
+}
+
+static void
+ViaTVRestore(ScrnInfoPtr pScrn)
+{
+ VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
+
+ if (pBIOSInfo->TVRestore)
+ pBIOSInfo->TVRestore(pScrn);
+}
+
+static Bool
+ViaTVDACSense(ScrnInfoPtr pScrn)
+{
+ VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
+
+ if (pBIOSInfo->TVDACSense)
+ return pBIOSInfo->TVDACSense(pScrn);
+ return FALSE;
+}
+
+static void
+ViaTVSetMode(xf86CrtcPtr crtc, DisplayModePtr mode)
+{
+ ScrnInfoPtr pScrn = crtc->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+
+ if (pBIOSInfo->TVModeI2C)
+ pBIOSInfo->TVModeI2C(pScrn, mode);
+
+ if (pBIOSInfo->TVModeCrtc)
+ pBIOSInfo->TVModeCrtc(crtc, mode);
+
+ /* TV reset. */
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x1D, 0x00);
+ xf86I2CWriteByte(pBIOSInfo->TVI2CDev, 0x1D, 0x80);
+}
+
+static void
+ViaTVPower(ScrnInfoPtr pScrn, Bool On)
+{
+ VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
+
+#ifdef HAVE_DEBUG
+ if (On)
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaTVPower: On.\n");
+ else
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaTVPower: Off.\n");
+#endif
+
+ if (pBIOSInfo->TVPower)
+ pBIOSInfo->TVPower(pScrn, On);
+}
+
+#ifdef HAVE_DEBUG
+void
+ViaTVPrintRegs(ScrnInfoPtr pScrn)
+{
+ VIABIOSInfoPtr pBIOSInfo = VIAPTR(pScrn)->pBIOSInfo;
+
+ if (pBIOSInfo->TVPrintRegs)
+ pBIOSInfo->TVPrintRegs(pScrn);
+}
+#endif /* HAVE_DEBUG */
+
+static void
+via_tv_create_resources(xf86OutputPtr output)
+{
+}
+
+#ifdef RANDR_12_INTERFACE
+static Bool
+via_tv_set_property(xf86OutputPtr output, Atom property,
+ RRPropertyValuePtr value)
+{
+ return TRUE;
+}
+
+static Bool
+via_tv_get_property(xf86OutputPtr output, Atom property)
+{
+ return FALSE;
+}
+#endif
+
+static void
+via_tv_dpms(xf86OutputPtr output, int mode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+
+ switch (mode) {
+ case DPMSModeOn:
+ ViaTVPower(pScrn, TRUE);
+ break;
+
+ case DPMSModeStandby:
+ case DPMSModeSuspend:
+ case DPMSModeOff:
+ ViaTVPower(pScrn, FALSE);
+ break;
+ }
+}
+
+static void
+via_tv_save(xf86OutputPtr output)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+
+ ViaTVSave(pScrn);
+}
+
+static void
+via_tv_restore(xf86OutputPtr output)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+
+ ViaTVRestore(pScrn);
+}
+
+static int
+via_tv_mode_valid(xf86OutputPtr output, DisplayModePtr pMode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ int ret = MODE_OK;
+
+ if (!ViaModeDotClockTranslate(pScrn, pMode))
+ return MODE_NOCLOCK;
+
+ return ret;
+}
+
+static Bool
+via_tv_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ return TRUE;
+}
+
+static void
+via_tv_prepare(xf86OutputPtr output)
+{
+ via_tv_dpms(output, DPMSModeOff);
+}
+
+static void
+via_tv_commit(xf86OutputPtr output)
+{
+ via_tv_dpms(output, DPMSModeOn);
+}
+
+static void
+ViaDisplayEnableDVO(ScrnInfoPtr pScrn, int port)
+{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayEnableDVO, port:
%d\n",
+ port));
+ switch (port) {
+ case VIA_DI_PORT_DVP0:
+ ViaSeqMask(hwp, 0x1E, 0xC0, 0xC0);
+ break;
+ case VIA_DI_PORT_DVP1:
+ ViaSeqMask(hwp, 0x1E, 0x30, 0x30);
+ break;
+ }
+}
+
+static void
+ViaDisplayDisableDVO(ScrnInfoPtr pScrn, int port)
+{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplayDisableDVO, port:
%d\n",
+ port));
+ switch (port) {
+ case VIA_DI_PORT_DVP0:
+ ViaSeqMask(hwp, 0x1E, 0x00, 0xC0);
+ break;
+ case VIA_DI_PORT_DVP1:
+ ViaSeqMask(hwp, 0x1E, 0x00, 0x30);
+ break;
+ }
+}
+
+static void
+ViaDisplaySetStreamOnDVO(ScrnInfoPtr pScrn, int port, int iga)
+{
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ int regNum;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaDisplaySetStreamOnDVO,
port: %d\n",
+ port));
+
+ switch (port) {
+ case VIA_DI_PORT_DVP0:
+ regNum = 0x96;
+ break;
+ case VIA_DI_PORT_DVP1:
+ regNum = 0x9B;
+ break;
+ case VIA_DI_PORT_DFPLOW:
+ regNum = 0x97;
+ break;
+ case VIA_DI_PORT_DFPHIGH:
+ regNum = 0x99;
+ break;
+ }
+
+ if (!iga)
+ ViaCrtcMask(hwp, regNum, 0x00, 0x10);
+ else
+ ViaCrtcMask(hwp, regNum, 0x10, 0x10);
+}
+
+static void
+via_tv_mode_set(xf86OutputPtr output, DisplayModePtr mode,
+ DisplayModePtr adjusted_mode)
+{
+ ScrnInfoPtr pScrn = output->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+
+ /* TV on FirstCrtc */
+ if (output->crtc) {
+ drmmode_crtc_private_ptr iga = output->crtc->driver_private;
+
+ ViaDisplaySetStreamOnDVO(pScrn, pBIOSInfo->TVDIPort, iga->index);
+ }
+ ViaDisplayEnableDVO(pScrn, pBIOSInfo->TVDIPort);
+
+ ViaTVSetMode(output->crtc, adjusted_mode);
+
+ pVia->FirstInit = FALSE;
+}
+
+static xf86OutputStatus
+via_tv_detect(xf86OutputPtr output)
+{
+ xf86OutputStatus status = XF86OutputStatusDisconnected;
+ ScrnInfoPtr pScrn = output->scrn;
+
+ if (ViaTVDACSense(pScrn))
+ status = XF86OutputStatusConnected;
+ return status;
+}
+
+static DisplayModePtr
+via_tv_get_modes(xf86OutputPtr output)
+{
+ DisplayModePtr modes = NULL, mode = NULL;
+ ScrnInfoPtr pScrn = output->scrn;
+ VIAPtr pVia = VIAPTR(pScrn);
+ int i;
+
+ for (i = 0; i < pVia->pBIOSInfo->TVNumModes; i++) {
+ mode = xf86DuplicateMode(&pVia->pBIOSInfo->TVModes[i]);
+ modes = xf86ModesAdd(modes, mode);
+ }
+ return modes;
+}
+
+static void
+via_tv_destroy(xf86OutputPtr output)
+{
+}
+
+static const xf86OutputFuncsRec via_tv_funcs = {
+ .create_resources = via_tv_create_resources,
+#ifdef RANDR_12_INTERFACE
+ .set_property = via_tv_set_property,
+#endif
+#ifdef RANDR_13_INTERFACE
+ .get_property = via_tv_get_property,
+#endif
+ .dpms = via_tv_dpms,
+ .save = via_tv_save,
+ .restore = via_tv_restore,
+ .mode_valid = via_tv_mode_valid,
+ .mode_fixup = via_tv_mode_fixup,
+ .prepare = via_tv_prepare,
+ .commit = via_tv_commit,
+ .mode_set = via_tv_mode_set,
+ .detect = via_tv_detect,
+ .get_modes = via_tv_get_modes,
+ .destroy = via_tv_destroy,
+};
+
+/*
+ *
+ */
+Bool
+via_tv_init(ScrnInfoPtr pScrn)
+{
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+ xf86OutputPtr output = NULL;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Entered via_tv_init.\n"));
+
+ /* preset some pBIOSInfo TV related values -- move up */
+ pBIOSInfo->TVEncoder = VIA_NONETV;
+ pBIOSInfo->TVI2CDev = NULL;
+ pBIOSInfo->TVSave = NULL;
+ pBIOSInfo->TVRestore = NULL;
+ pBIOSInfo->TVDACSense = NULL;
+ pBIOSInfo->TVModeValid = NULL;
+ pBIOSInfo->TVModeI2C = NULL;
+ pBIOSInfo->TVModeCrtc = NULL;
+ pBIOSInfo->TVPower = NULL;
+ pBIOSInfo->TVModes = NULL;
+ pBIOSInfo->TVPrintRegs = NULL;
+ pBIOSInfo->LCDPower = NULL;
+ pBIOSInfo->TVNumRegs = 0;
+
+ /*
+ * On an SK43G (KM400/Ch7011), false positive detections at a VT162x
+ * chip were observed, so try to detect the Ch7011 first.
+ */
+ if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, 0xEC))
+ pBIOSInfo->TVI2CDev = ViaCH7xxxDetect(pScrn, pVia->pI2CBus2, 0xEC);
+ else if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, 0x40))
+ pBIOSInfo->TVI2CDev = ViaVT162xDetect(pScrn, pVia->pI2CBus2, 0x40);
+ else if (pVia->pI2CBus3 && xf86I2CProbeAddress(pVia->pI2CBus3, 0x40))
+ pBIOSInfo->TVI2CDev = ViaVT162xDetect(pScrn, pVia->pI2CBus3, 0x40);
+ else if (pVia->pI2CBus2 && xf86I2CProbeAddress(pVia->pI2CBus2, 0xEA))
+ pBIOSInfo->TVI2CDev = ViaCH7xxxDetect(pScrn, pVia->pI2CBus2, 0xEA);
+ else if (pVia->pI2CBus3 && xf86I2CProbeAddress(pVia->pI2CBus3, 0xEA))
+ pBIOSInfo->TVI2CDev = ViaCH7xxxDetect(pScrn, pVia->pI2CBus3, 0xEA);
+
+ if (!pBIOSInfo->TVI2CDev) {
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ "Did not detect a TV encoder.\n");
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_tv_init.\n"));
+
+ return FALSE;
+ }
+
+ switch (pBIOSInfo->TVEncoder) {
+ case VIA_VT1621:
+ case VIA_VT1622:
+ case VIA_VT1623:
+ case VIA_VT1625:
+ ViaVT162xInit(pScrn);
+ break;
+ case VIA_CH7011:
+ case VIA_CH7019A:
+ case VIA_CH7019B:
+ ViaCH7xxxInit(pScrn);
+ break;
+ default:
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Was not able to initialize a known TV encoder.\n");
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_tv_init.\n"));
+ return FALSE;
+ break;
+ }
+
+ if (!pBIOSInfo->TVSave || !pBIOSInfo->TVRestore
+ || !pBIOSInfo->TVDACSense || !pBIOSInfo->TVModeValid
+ || !pBIOSInfo->TVModeI2C || !pBIOSInfo->TVModeCrtc
+ || !pBIOSInfo->TVPower || !pBIOSInfo->TVModes
+ || !pBIOSInfo->TVPrintRegs) {
+
+ xf86DestroyI2CDevRec(pBIOSInfo->TVI2CDev, TRUE);
+
+ pBIOSInfo->TVI2CDev = NULL;
+ pBIOSInfo->TVOutput = TVOUTPUT_NONE;
+ pBIOSInfo->TVEncoder = VIA_NONETV;
+ pBIOSInfo->TVI2CDev = NULL;
+ pBIOSInfo->TVSave = NULL;
+ pBIOSInfo->TVRestore = NULL;
+ pBIOSInfo->TVDACSense = NULL;
+ pBIOSInfo->TVModeValid = NULL;
+ pBIOSInfo->TVModeI2C = NULL;
+ pBIOSInfo->TVModeCrtc = NULL;
+ pBIOSInfo->TVPower = NULL;
+ pBIOSInfo->TVModes = NULL;
+ pBIOSInfo->TVPrintRegs = NULL;
+ pBIOSInfo->TVNumRegs = 0;
+
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "TV encoder was not properly initialized.\n");
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_tv_init.\n"));
+ return FALSE;
+ }
+
+ output = xf86OutputCreate(pScrn, &via_tv_funcs, "TV-1");
+ pVia->FirstInit = TRUE;
+
+ if (output) {
+ /* Allow tv output on both crtcs, set bit 0 and 1. */
+ output->possible_crtcs = 0x3;
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to register TV-1.\n");
+ }
+
+ pBIOSInfo->tv = output;
+ /* Save now */
+ pBIOSInfo->TVSave(pScrn);
+
+#ifdef HAVE_DEBUG
+ if (VIAPTR(pScrn)->PrintTVRegs)
+ pBIOSInfo->TVPrintRegs(pScrn);
+#endif
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Exiting via_tv_init.\n"));
+ return TRUE;
+}
diff --git a/src/via_ums.h b/src/via_ums.h
index 8f43aed..11d4bb3 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -192,12 +192,6 @@ Bool umsCrtcInit(ScrnInfoPtr pScrn);
void viaOutputDetect(ScrnInfoPtr pScrn);
CARD32 ViaGetMemoryBandwidth(ScrnInfoPtr pScrn);
CARD32 ViaModeDotClockTranslate(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaTVPower(ScrnInfoPtr pScrn, Bool On);
-void ViaTVSave(ScrnInfoPtr pScrn);
-void ViaTVRestore(ScrnInfoPtr pScrn);
-#ifdef HAVE_DEBUG
-void ViaTVPrintRegs(ScrnInfoPtr pScrn);
-#endif
void viaProbePinStrapping(ScrnInfoPtr pScrn);
void ViaSetPrimaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
@@ -233,6 +227,12 @@ void via_lvds_init(ScrnInfoPtr pScrn);
void viaTMDSPower(ScrnInfoPtr pScrn, Bool On);
void via_dvi_init(ScrnInfoPtr pScrn);
+/*via_tv.c */
+#ifdef HAVE_DEBUG
+void ViaTVPrintRegs(ScrnInfoPtr pScrn);
+#endif
+Bool via_tv_init(ScrnInfoPtr pScrn);
+
/* in via_bandwidth.c */
void ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaSetSecondaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
