From 99bf62514fed837810e332cd356a4b9f92eb3ebc Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Tue, 19 Oct 2010 14:48:26 -0700 Subject: [PATCH] video: tegra: don't enable display when mode is invalid Change-Id: I84a494f7c125ceadbe39a681a8ed7cfa244a6a2b Signed-off-by: Erik Gilling --- drivers/video/tegra/dc/dc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index bea8080b7d15..ac8497fe9061 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -818,8 +818,11 @@ static void tegra_dc_init(struct tegra_dc *dc) tegra_dc_program_mode(dc, &dc->mode); } -static void _tegra_dc_enable(struct tegra_dc *dc) +static bool _tegra_dc_enable(struct tegra_dc *dc) { + if (dc->mode.pclk == 0) + return false; + tegra_dc_io_start(dc); if (dc->out && dc->out->enable) @@ -837,16 +840,16 @@ static void _tegra_dc_enable(struct tegra_dc *dc) /* force a full blending update */ dc->blend.z[0] = -1; + + return true; } void tegra_dc_enable(struct tegra_dc *dc) { mutex_lock(&dc->lock); - if (!dc->enabled) { - _tegra_dc_enable(dc); - dc->enabled = true; - } + if (!dc->enabled) + dc->enabled = _tegra_dc_enable(dc); mutex_unlock(&dc->lock); } -- 2.34.1