diff options
| author | Jong Kim <jongk@nvidia.com> | 2013-07-01 14:19:54 -0700 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2013-07-11 14:21:34 -0700 |
| commit | b258d9754147ef0637f73cc37fdf9c7f1d671ec5 (patch) | |
| tree | 7bbfd54a50a34a3cc77e950302569d9ba213825e | |
| parent | 91bfbf082fae9023f1a1978743c6662858e6aa47 (diff) | |
video: tegra: fb: hdmi: enable new mode on HDMI
Enable HDMI as primary framebuffer console by programming the HW when
new/best mode is detected.
bug 1264520
Change-Id: I8862d2860c97a1241d4acae8206c71de06ea0162
Signed-off-by: Jong Kim <jongk@nvidia.com>
Reviewed-on: http://git-master/r/243981
(cherry picked from commit a49c55a39ee7b6e2b1075b7441f500c4572c2ddd)
Reviewed-on: http://git-master/r/247279
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Tested-by: Matthew Pedro <mapedro@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 4 | ||||
| -rw-r--r-- | drivers/video/tegra/fb.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 259c08431deb..e32826c80fc0 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -963,10 +963,6 @@ static void tegra_dc_hdmi_detect_worker(struct work_struct *work) /* board files are expected to allow multiple calls to hotplug_init() */ tegra_dc_hotplug_init(dc); -#ifdef CONFIG_FRAMEBUFFER_CONSOLE - /* Set default videomode on dc before enabling it*/ - tegra_dc_set_default_videomode(dc); -#endif if (!tegra_dc_hdmi_detect(dc) && dc->connected) { dev_dbg(&dc->ndev->dev, "HDMI disconnect\n"); dc->connected = false; diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index 52c3a82e9be9..229b23231cd8 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -544,7 +544,14 @@ void tegra_fb_update_monspecs(struct tegra_fb_info *fb_info, event.info = fb_info->info; #ifdef CONFIG_FRAMEBUFFER_CONSOLE console_lock(); + if ((fb_info->win->dc->out != NULL) && + (fb_info->win->dc->out->type == TEGRA_DC_OUT_HDMI)) + tegra_fb_blank(FB_BLANK_POWERDOWN, fb_info->info); + /* fb_call chain is blocking call */ fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event); + if ((fb_info->win->dc->out != NULL) && + (fb_info->win->dc->out->type == TEGRA_DC_OUT_HDMI)) + tegra_fb_blank(FB_BLANK_UNBLANK, fb_info->info); console_unlock(); #else fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event); |