Module Name: src
Committed By: jmcneill
Date: Mon Oct 19 22:00:09 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_hdmi.c
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
allow "hdmi.forcemode=dvi" kernel option to force HDMI transmitter into DVI mode
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_hdmi.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/tegra/tegra_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_hdmi.c
diff -u src/sys/arch/arm/nvidia/tegra_hdmi.c:1.9 src/sys/arch/arm/nvidia/tegra_hdmi.c:1.10
--- src/sys/arch/arm/nvidia/tegra_hdmi.c:1.9 Fri Jul 31 23:07:14 2015
+++ src/sys/arch/arm/nvidia/tegra_hdmi.c Mon Oct 19 22:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdmi.c,v 1.9 2015/07/31 23:07:14 jmcneill Exp $ */
+/* $NetBSD: tegra_hdmi.c,v 1.10 2015/10/19 22:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_hdmi.c,v 1.9 2015/07/31 23:07:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_hdmi.c,v 1.10 2015/10/19 22:00:09 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -198,10 +198,12 @@ tegra_hdmi_hpd(struct tegra_hdmi_softc *
static void
tegra_hdmi_connect(struct tegra_hdmi_softc *sc)
{
+ prop_dictionary_t prop = device_properties(sc->sc_dev);
const struct videomode *mode;
char edid[128], *pedid = NULL;
struct edid_info ei;
int retry = 4, error;
+ bool force_dvi = false;
memset(&ei, 0, sizeof(ei));
@@ -237,7 +239,12 @@ tegra_hdmi_connect(struct tegra_hdmi_sof
}
sc->sc_curmode = mode;
- sc->sc_hdmimode = tegra_hdmi_is_hdmi(sc, &ei);
+ prop_dictionary_get_bool(prop, "force-dvi", &force_dvi);
+ if (force_dvi) {
+ sc->sc_hdmimode = false;
+ } else {
+ sc->sc_hdmimode = tegra_hdmi_is_hdmi(sc, &ei);
+ }
tegra_hdmi_enable(sc, pedid);
}
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.20 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.21
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.20 Sun Oct 18 17:07:36 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Mon Oct 19 22:00:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.20 2015/10/18 17:07:36 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.21 2015/10/19 22:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.20 2015/10/18 17:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.21 2015/10/19 22:00:09 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -472,6 +472,9 @@ tegra_device_register(device_t self, voi
prop_dictionary_set_cstring(dict, "power-gpio", "K6");
prop_dictionary_set_cstring(dict, "ddc-device", "ddc0");
prop_dictionary_set_cstring(dict, "display-device", "tegradc1");
+ if (tegra_bootconf_match("hdmi.forcemode", "dvi")) {
+ prop_dictionary_set_bool(dict, "force-dvi", true);
+ }
}
#endif
