aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/hdmi.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 5cddf2e9996..83112355bc2 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1198,7 +1198,6 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
1198 dssdev->panel.timings.y_res); 1198 dssdev->panel.timings.y_res);
1199 1199
1200 if (!hdmi.custom_set) { 1200 if (!hdmi.custom_set) {
1201 code = get_timings_index();
1202 DSSDBG("Read EDID as no EDID is not set on poweron\n"); 1201 DSSDBG("Read EDID as no EDID is not set on poweron\n");
1203 hdmi_read_edid(p); 1202 hdmi_read_edid(p);
1204 dirty = get_timings_index() != code; 1203 dirty = get_timings_index() != code;
@@ -1213,11 +1212,11 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
1213 1212
1214 hdmi_wp_video_start(0); 1213 hdmi_wp_video_start(0);
1215 1214
1216 if (dirty) { 1215 if (dirty) {
1217 omap_dss_notify(dssdev, OMAP_DSS_SIZE_CHANGE); 1216 omap_dss_notify(dssdev, OMAP_DSS_SIZE_CHANGE);
1218 } 1217 }
1219 1218
1220 /* config the PLL and PHY first */ 1219 /* config the PLL and PHY first */
1221 r = hdmi_pll_program(&pll_data); 1220 r = hdmi_pll_program(&pll_data);
1222 if (r) { 1221 if (r) {
1223 DSSDBG("Failed to lock PLL\n"); 1222 DSSDBG("Failed to lock PLL\n");