diff options
| author | Chong Zhang <chzhang@nvidia.com> | 2011-01-28 17:14:37 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-02-14 15:56:27 -0800 |
| commit | 65d462bc697dbb55da2db7c3ba2045811a9454b4 (patch) | |
| tree | 2ba1a4eaec752dcc60b53ecac5240861e1e1138b | |
| parent | e56a2ffd613f71dd43c6abe0adcd7eba27a488bc (diff) | |
video: tegra: hdmi stereo mode set fix
Reverting previous hdmi hotplug fix (commit
633a7967cad4454327572f85fbdf5cd88eb68b78). It doesn't
seem to fix hotplug problem on ventana, and it is
causing tegra_dc_enable() to be called before we
set up hdmi mode properly. It's no longer needed
when we set ventna_hdmi_enb=1.
The 5ms sleep time after tegra_dc_enable() is no
longer needed, as the tegra_dc_enable() is removed
from tegra_dc_hdmi_detect_worker().
bug 784597
Change-Id: Ibd2ef95f45bec23031e6f839490f06a2832c6931
Reviewed-on: http://git-master/r/17084
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 10 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 83070a76834e..22350d587472 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1124,17 +1124,17 @@ static void tegra_dc_init(struct tegra_dc *dc) static bool _tegra_dc_enable(struct tegra_dc *dc) { - if (!dc->out) + if (dc->mode.pclk == 0) return false; - if (dc->out->enable) - dc->out->enable(); - - if (dc->mode.pclk == 0) + if (!dc->out) return false; tegra_dc_io_start(dc); + if (dc->out->enable) + dc->out->enable(); + tegra_dc_setup_clk(dc, dc->clk); clk_enable(dc->clk); diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 6ef15c6b0421..44aa843b5482 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -500,8 +500,6 @@ static void tegra_dc_hdmi_detect_worker(struct work_struct *work) container_of(to_delayed_work(work), struct tegra_dc_hdmi_data, work); struct tegra_dc *dc = hdmi->dc; - tegra_dc_enable(dc); - msleep(5); if (!tegra_dc_hdmi_detect(dc)) { tegra_dc_disable(dc); tegra_fb_update_monspecs(dc->fb, NULL, NULL); |