summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandor Yu <R01008@freescale.com>2012-12-27 18:14:52 +0800
committerXinyu Chen <xinyu.chen@freescale.com>2013-01-08 13:18:26 +0800
commita75a18386e0dd4caf8ed222a9dce7c9b27aba991 (patch)
tree8f0393cd966d69dcc78c982d7bb53fd556e9237c
parent4417ffc4d594896152f7e6cf7a9bd2f0ccd449e3 (diff)
ENGR00238391 MX6x HDMI: Add default EDID config function when read EDID failed
Add default EDID config function when read EDID failed. Fix HDMI no audio issue when failed read EDID. Signed-off-by: Sandor Yu <R01008@freescale.com>
-rw-r--r--drivers/video/mxc_hdmi.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c
index 78397534f796..68f66450c26f 100644
--- a/drivers/video/mxc_hdmi.c
+++ b/drivers/video/mxc_hdmi.c
@@ -1562,6 +1562,12 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi)
console_unlock();
}
+static void mxc_hdmi_default_edid_cfg(struct mxc_hdmi *hdmi)
+{
+ /* Default setting HDMI working in HDMI mode */
+ hdmi->edid_cfg.hdmi_cap = true;
+}
+
static void mxc_hdmi_default_modelist(struct mxc_hdmi *hdmi)
{
u32 i;
@@ -1686,8 +1692,10 @@ static void mxc_hdmi_cable_connected(struct mxc_hdmi *hdmi)
case HDMI_EDID_SAME:
break;
- case HDMI_EDID_NO_MODES:
case HDMI_EDID_FAIL:
+ mxc_hdmi_default_edid_cfg(hdmi);
+ /* No break here */
+ case HDMI_EDID_NO_MODES:
default:
mxc_hdmi_default_modelist(hdmi);
break;