Revert "video: tegra: dc: fix boot issue with HDMI"
Jon Mayo [Fri, 17 Aug 2012 21:12:17 +0000 (14:12 -0700)]
This reverts commit 50fa5e50b74a0534d7524fb6d7dcaa65b2e6e74c.

Change-Id: I535127153082dae5ec701bbb876af002c9ebf5a3
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/124449
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit

drivers/video/tegra/dc/dc.c

index c33858a..da7f291 100644 (file)
@@ -1814,8 +1814,8 @@ static int tegra_dc_probe(struct nvhost_device *ndev,
 
        mutex_lock(&dc->lock);
        if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) {
-               _tegra_dc_set_default_videomode(dc);
                dc->enabled = _tegra_dc_enable(dc);
+               _tegra_dc_set_default_videomode(dc);
        }
        mutex_unlock(&dc->lock);
 
@@ -1965,8 +1965,8 @@ static int tegra_dc_resume(struct nvhost_device *ndev)
        dc->suspended = false;
 
        if (dc->enabled) {
-               _tegra_dc_set_default_videomode(dc);
                _tegra_dc_enable(dc);
+               _tegra_dc_set_default_videomode(dc);
        }
 
        if (dc->out && dc->out->hotplug_init)