summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-06-22 20:40:20 +0100
committerAndy Green <andy.green@linaro.org>2011-06-22 20:40:20 +0100
commit220f67caa9dd27ac85608e3c38621a9180982000 (patch)
tree0a3e9ad02ad4b7c5eccbe4ad6e49409d3e5b02e6
parente5b4b5646cf90ab81af9ee8cb2b4a4c0dc451b66 (diff)
Subject: [PATCH 12/19] hdmi add notification
Signed-off-by: Andy Green <andy.green@linaro.org>
-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 d6b31394e55..c44029a2511 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1127,7 +1127,6 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
dssdev->panel.timings.y_res);
if (!hdmi.custom_set) {
- code = get_timings_index();
DSSDBG("Read EDID as no EDID is not set on poweron\n");
hdmi_read_edid(p);
dirty = get_timings_index() != code;
@@ -1142,11 +1141,11 @@ static int hdmi_power_on(struct omap_dss_device *dssdev)
hdmi_wp_video_start(0);
- if (dirty) {
- omap_dss_notify(dssdev, OMAP_DSS_SIZE_CHANGE);
- }
-
- /* config the PLL and PHY first */
+ if (dirty) {
+ omap_dss_notify(dssdev, OMAP_DSS_SIZE_CHANGE);
+ }
+
+ /* config the PLL and PHY first */
r = hdmi_pll_program(&pll_data);
if (r) {
DSSDBG("Failed to lock PLL\n");