diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-08-22 11:33:32 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-08-22 11:33:32 +0300 |
| commit | 0b3d9cfe7d6ac9cedd2ddbb6f3415980b3cfc36e (patch) | |
| tree | 71ab19fd5de11daa9fe660449c65baaaa809887b | |
| parent | 60548a2b943674c8a4e9cf44d1ea1ccb239fa8ff (diff) | |
| download | linux-stable-0b3d9cfe7d6ac9cedd2ddbb6f3415980b3cfc36e.tar.gz | |
OMAPDSS: HDMI: fix initial HDMI enable
Commit 7849398fa28c21dad24292b838b059a862f99f16 introduced a bug,
causing the following error to be reported:
[ 370.827819] cannot lock PLL
[ 370.830749] CFG1 0x1e
[ 370.833160] CFG2 0x602004
[ 370.835876] CFG4 0x40000
[ 370.838562] omapdss HDMI: Failed to lock PLL
However, HDMI output is still enabled.
The problem is that we enable the HDMI video output temporarily when
reading EDID or detecting if a HDMI cable is connected (ugh), and the
commit above changes the behavior of the driver so that the video
timings are not yet configured at the point when EDID is read.
This patch fixes the problem by configuring the initial VGA timings at
HDMI probe.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | drivers/video/omap2/dss/hdmi_panel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c index 2feb2cdfb60f..69fb115bab32 100644 --- a/drivers/video/omap2/dss/hdmi_panel.c +++ b/drivers/video/omap2/dss/hdmi_panel.c @@ -67,6 +67,8 @@ static int hdmi_panel_probe(struct omap_dss_device *dssdev) dssdev->panel.timings.x_res, dssdev->panel.timings.y_res); + omapdss_hdmi_display_set_timing(dssdev, &dssdev->panel.timings); + return 0; } |