summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/tegra/dc/dc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index d8e7319..ced1b23 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -1489,7 +1489,10 @@ static void _tegra_dc_controller_disable(struct tegra_dc *dc)
tegra_dc_writel(dc, 0, DC_CMD_INT_ENABLE);
disable_irq(dc->irq);
+#ifndef CONFIG_MACH_COLIBRI_T20
+/* Hack to prevent boot lock-up if HDMI is not connected. */
tegra_dc_clear_bandwidth(dc);
+#endif
tegra_dc_clk_disable(dc);
if (dc->out && dc->out->disable)
@@ -1586,6 +1589,8 @@ void tegra_dc_disable(struct tegra_dc *dc)
{
tegra_dc_ext_disable(dc->ext);
+ msleep(1);
+
/* it's important that new underflow work isn't scheduled before the
* lock is acquired. */
cancel_delayed_work_sync(&dc->underflow_work);