summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLiu Xiaowen <b37945@freescale.com>2013-11-28 10:16:53 +0800
committerXianzhong <b07117@freescale.com>2013-11-29 01:12:00 +0800
commitf78c9270a1bcdcda11ba92cf8f4615e4040eaa17 (patch)
treeb47f255566b868a0fa378f1c32d6319511066266 /drivers
parent193f7f83560c7cd2c3bbbe2136701a61418534d2 (diff)
ENGR00215174 HDMI video: use default video mode when HDMI cable plug.
In original implement, HDMI driver will use the last video mode when cable plugin. Change the mechanism, use default video mode seting in bootargs. Signed-off-by: Liu Xiaowen <b37945@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mxc_hdmi.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c
index bffac867bc6e..469b1e8db487 100644
--- a/drivers/video/mxc_hdmi.c
+++ b/drivers/video/mxc_hdmi.c
@@ -1885,17 +1885,14 @@ static void mxc_hdmi_set_mode(struct mxc_hdmi *hdmi)
dev_dbg(&hdmi->pdev->dev, "%s\n", __func__);
/* Set the default mode only once. */
- if (!hdmi->dft_mode_set) {
- dev_dbg(&hdmi->pdev->dev, "%s: setting to default=%s bpp=%d\n",
- __func__, hdmi->dft_mode_str, hdmi->default_bpp);
+ dev_dbg(&hdmi->pdev->dev, "%s: setting to default=%s bpp=%d\n",
+ __func__, hdmi->dft_mode_str, hdmi->default_bpp);
- fb_find_mode(&var, hdmi->fbi,
- hdmi->dft_mode_str, NULL, 0, NULL,
- hdmi->default_bpp);
+ fb_find_mode(&var, hdmi->fbi,
+ hdmi->dft_mode_str, NULL, 0, NULL,
+ hdmi->default_bpp);
- hdmi->dft_mode_set = true;
- } else
- fb_videomode_to_var(&var, &hdmi->previous_non_vga_mode);
+ hdmi->dft_mode_set = true;
fb_var_to_videomode(&m, &var);
dump_fb_videomode(&m);