summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc
diff options
context:
space:
mode:
authorPritesh Raithatha <praithatha@nvidia.com>2012-05-09 19:36:46 +0530
committerSimone Willett <swillett@nvidia.com>2012-05-15 15:46:20 -0700
commit8f32f7ea6d4cdadb274ada410596a98363ffa916 (patch)
tree5ee590d26f4d6beebc755ffe590f22e0d21d6b61 /drivers/video/tegra/dc
parentac0ba404dea9e3c0524fb300b94c032ba8b710a2 (diff)
video: tegra: dc: correct dc initialisation sequence
-Move _tegra_dc_enable to before irq_request and remove disable_dc_irq. -It will remove warning of "IRQ when DC not powered!". Bug 955184 Change-Id: If9b039f3f1635d92f10bfc54af08101972fc3d57 Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/101498 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc')
-rw-r--r--drivers/video/tegra/dc/dc.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 063d12e..e131937 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -3041,6 +3041,11 @@ static int tegra_dc_probe(struct nvhost_device *ndev)
dc->ext = NULL;
}
+ mutex_lock(&dc->lock);
+ if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED)
+ dc->enabled = _tegra_dc_enable(dc);
+ mutex_unlock(&dc->lock);
+
/* interrupt handler must be registered before tegra_fb_register() */
if (request_irq(irq, tegra_dc_irq, IRQF_DISABLED,
dev_name(&ndev->dev), dc)) {
@@ -3049,14 +3054,6 @@ static int tegra_dc_probe(struct nvhost_device *ndev)
goto err_put_emc_clk;
}
- /* hack to balance enable_irq calls in _tegra_dc_enable() */
- disable_dc_irq(dc->irq);
-
- mutex_lock(&dc->lock);
- if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED)
- dc->enabled = _tegra_dc_enable(dc);
- mutex_unlock(&dc->lock);
-
tegra_dc_create_debugfs(dc);
dev_info(&ndev->dev, "probed\n");