diff options
author | Animesh Kishore <ankishore@nvidia.com> | 2012-01-27 09:25:48 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:02:04 -0400 |
commit | eddf119daadfa1d5dc09241c609c417e77b71033 (patch) | |
tree | e66efc7d89f9b858637406148b6a49cf55f9dbeb /drivers/video | |
parent | a0f8409354609f0c0023ab48b8223b68f11c3d36 (diff) |
video: tegra: dc: Call display client disable before dc irq disable
dc irqs are required in display client disable to flag
stopping of dc stream.
Bug 930453
Reviewed-on: http://git-master/r/77808
Change-Id: I0e057ca14078d9e608cb32380123fade813c4041
Signed-off-by: Animesh Kishore <ankishore@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/78898
Reviewed-by: Automatic_Commit_Validation_User
Rebase-Id: R2736ddb908b90a0fd509e69f5b9d5f364135d653
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/tegra/dc/dc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 0d6491cc8..fce7da231 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c | |||
@@ -2435,13 +2435,13 @@ static void _tegra_dc_controller_disable(struct tegra_dc *dc) | |||
2435 | { | 2435 | { |
2436 | unsigned i; | 2436 | unsigned i; |
2437 | 2437 | ||
2438 | if (dc->out_ops && dc->out_ops->disable) | ||
2439 | dc->out_ops->disable(dc); | ||
2440 | |||
2438 | tegra_dc_writel(dc, 0, DC_CMD_INT_MASK); | 2441 | tegra_dc_writel(dc, 0, DC_CMD_INT_MASK); |
2439 | tegra_dc_writel(dc, 0, DC_CMD_INT_ENABLE); | 2442 | tegra_dc_writel(dc, 0, DC_CMD_INT_ENABLE); |
2440 | disable_irq(dc->irq); | 2443 | disable_irq(dc->irq); |
2441 | 2444 | ||
2442 | if (dc->out_ops && dc->out_ops->disable) | ||
2443 | dc->out_ops->disable(dc); | ||
2444 | |||
2445 | tegra_dc_clear_bandwidth(dc); | 2445 | tegra_dc_clear_bandwidth(dc); |
2446 | clk_disable(dc->clk); | 2446 | clk_disable(dc->clk); |
2447 | tegra_dvfs_set_rate(dc->clk, 0); | 2447 | tegra_dvfs_set_rate(dc->clk, 0); |