summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc
diff options
context:
space:
mode:
authorHunk Lin <hulin@nvidia.com>2012-05-03 05:35:47 +0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-05-03 13:54:45 -0700
commit9c36a7d25b978864c25a5c5649cd803898872600 (patch)
tree03731dbd142b8332e5f40fbe020a9eb3a131af5a /drivers/video/tegra/dc
parent22886da975d44546736b69c64414b56bf3eb7186 (diff)
Revert "video: tegra: dc: Set default videomode"
This reverts commit 9349cedf17f9b3c10760c8d48f831473f87a3a15. It is reviewed on http://git-master/r/99635 It will cause HDMI power ON and emc clock bump up to 667Mhz after resume from LP0. bug 930136 Change-Id: I130494fdb381b3d322ac0e3fc8be2e44f2c2d7a7 Signed-off-by: Hunk Lin <hulin@nvidia.com> Reviewed-on: http://git-master/r/100202 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc')
-rw-r--r--drivers/video/tegra/dc/dc.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 7161d8b..11e6281 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -64,20 +64,6 @@
#endif
static int no_vsync;
-static struct fb_videomode tegra_dc_hdmi_fallback_mode = {
- .refresh = 60,
- .xres = 640,
- .yres = 480,
- .pixclock = KHZ2PICOS(25200),
- .hsync_len = 96, /* h_sync_width */
- .vsync_len = 2, /* v_sync_width */
- .left_margin = 48, /* h_back_porch */
- .upper_margin = 33, /* v_back_porch */
- .right_margin = 16, /* h_front_porch */
- .lower_margin = 10, /* v_front_porch */
- .vmode = 0,
- .sync = 0,
-};
static void _tegra_dc_controller_disable(struct tegra_dc *dc);
@@ -2636,19 +2622,10 @@ static bool _tegra_dc_controller_reset_enable(struct tegra_dc *dc)
}
#endif
-static int _tegra_dc_set_default_videomode(struct tegra_dc *dc)
-{
- return tegra_dc_set_fb_mode(dc, &tegra_dc_hdmi_fallback_mode, 0);
-}
-
static bool _tegra_dc_enable(struct tegra_dc *dc)
{
- if (dc->mode.pclk == 0) {
- /* DC enable called but no videomode is loaded.
- Set fallback mode to enable driver with.*/
- if (_tegra_dc_set_default_videomode(dc))
- return false;
- }
+ if (dc->mode.pclk == 0)
+ return false;
if (!dc->out)
return false;