Module Name: src
Committed By: jmcneill
Date: Mon May 18 21:03:36 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_hdmi.c tegra_pmc.c tegra_pmcreg.h
tegra_var.h
Log Message:
Make sure HDMI I/O is not in deep power down mode
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_hdmi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_pmc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_pmcreg.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_var.h
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.1 src/sys/arch/arm/nvidia/tegra_hdmi.c:1.2
--- src/sys/arch/arm/nvidia/tegra_hdmi.c:1.1 Mon May 18 19:32:48 2015
+++ src/sys/arch/arm/nvidia/tegra_hdmi.c Mon May 18 21:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdmi.c,v 1.1 2015/05/18 19:32:48 jmcneill Exp $ */
+/* $NetBSD: tegra_hdmi.c,v 1.2 2015/05/18 21:03:36 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_hdmi.c,v 1.1 2015/05/18 19:32:48 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_hdmi.c,v 1.2 2015/05/18 21:03:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -244,6 +244,8 @@ tegra_hdmi_enable(struct tegra_hdmi_soft
KASSERT(sc->sc_curmode != NULL);
+ tegra_pmc_hdmi_enable();
+
tegra_car_hdmi_enable(mode->dot_clock * 1000);
for (n = 0; n < __arraycount(tegra_hdmi_tmds_config); n++) {
Index: src/sys/arch/arm/nvidia/tegra_pmc.c
diff -u src/sys/arch/arm/nvidia/tegra_pmc.c:1.4 src/sys/arch/arm/nvidia/tegra_pmc.c:1.5
--- src/sys/arch/arm/nvidia/tegra_pmc.c:1.4 Fri May 15 11:50:30 2015
+++ src/sys/arch/arm/nvidia/tegra_pmc.c Mon May 18 21:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pmc.c,v 1.4 2015/05/15 11:50:30 jmcneill Exp $ */
+/* $NetBSD: tegra_pmc.c,v 1.5 2015/05/18 21:03:36 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pmc.c,v 1.4 2015/05/15 11:50:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pmc.c,v 1.5 2015/05/18 21:03:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -143,3 +143,17 @@ tegra_pmc_remove_clamping(u_int partid)
bus_space_write_4(bst, bsh, PMC_REMOVE_CLAMPING_CMD_0_REG,
__BIT(partid));
}
+
+void
+tegra_pmc_hdmi_enable(void)
+{
+ bus_space_tag_t bst;
+ bus_space_handle_t bsh;
+
+ tegra_pmc_get_bs(&bst, &bsh);
+
+ tegra_reg_set_clear(bst, bsh, PMC_IO_DPD_STATUS_REG,
+ 0, PMC_IO_DPD_STATUS_HDMI);
+ tegra_reg_set_clear(bst, bsh, PMC_IO_DPD2_STATUS_REG,
+ 0, PMC_IO_DPD2_STATUS_HV);
+}
Index: src/sys/arch/arm/nvidia/tegra_pmcreg.h
diff -u src/sys/arch/arm/nvidia/tegra_pmcreg.h:1.3 src/sys/arch/arm/nvidia/tegra_pmcreg.h:1.4
--- src/sys/arch/arm/nvidia/tegra_pmcreg.h:1.3 Fri May 15 11:50:30 2015
+++ src/sys/arch/arm/nvidia/tegra_pmcreg.h Mon May 18 21:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pmcreg.h,v 1.3 2015/05/15 11:50:30 jmcneill Exp $ */
+/* $NetBSD: tegra_pmcreg.h,v 1.4 2015/05/18 21:03:36 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -87,4 +87,10 @@
#define PMC_PARTID_TD 1
#define PMC_PARTID_CPU0 0
+#define PMC_IO_DPD_STATUS_REG 0x1bc
+#define PMC_IO_DPD_STATUS_HDMI __BIT(28)
+
+#define PMC_IO_DPD2_STATUS_REG 0x1c4
+#define PMC_IO_DPD2_STATUS_HV __BIT(6)
+
#endif /* _ARM_TEGRA_PMCREG_H */
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.18 src/sys/arch/arm/nvidia/tegra_var.h:1.19
--- src/sys/arch/arm/nvidia/tegra_var.h:1.18 Mon May 18 20:36:42 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Mon May 18 21:03:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_var.h,v 1.18 2015/05/18 20:36:42 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.19 2015/05/18 21:03:36 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -137,6 +137,7 @@ bool tegra_mpio_pinmux_get_rcv_sel(u_int
void tegra_pmc_reset(void);
void tegra_pmc_power(u_int, bool);
void tegra_pmc_remove_clamping(u_int);
+void tegra_pmc_hdmi_enable(void);
psize_t tegra_mc_memsize(void);
