diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-03-08 00:37:21 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-03-10 21:40:44 -0800 |
| commit | 80c12ebb33e7cb69d39dfe581d53baed1238a7e6 (patch) | |
| tree | 5601128f171e18e3a5ff420cc17e5875e50441f6 /drivers | |
| parent | eb7a96d938247a38d38ebaee94bc3301f0399964 (diff) | |
merge: Fix merge
See:
commit 1c7ef350b68445758966f6acf0f4f8a62f4a8e75
Author: Erik Gilling <konkers@android.com>
Date: Fri Feb 18 16:24:37 2011 -0800
video: tegra: de-assert reset after clocks are turned on
In underflow recovery, if the clocks are not enabled when the dc is brought
out of reset writes to the DC will sometimes hang.
Change-Id: I6f741962e74cb076dccc60e0f444d66067fa570c
Reviewed-on: http://git-master/r/22308
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 403c8b786212..085ab037fc9e 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1297,8 +1297,6 @@ static void tegra_dc_reset_worker(struct work_struct *work) msleep(5); tegra_periph_reset_assert(dc->clk); - udelay(100); - tegra_periph_reset_deassert(dc->clk); msleep(2); if (dc->ndev->id == 0 && tegra_dcs[1] != NULL) { @@ -1309,6 +1307,7 @@ static void tegra_dc_reset_worker(struct work_struct *work) mutex_unlock(&tegra_dcs[0]->lock); } + /* _tegra_dc_enable deasserts reset */ _tegra_dc_controller_enable(dc); dc->enabled = true; |