Revert "Revert "video: tegra: dc: fix boot issue with HDMI""
Deepak Nibade [Fri, 24 Aug 2012 05:40:21 +0000 (10:40 +0530)]
This reverts commit ea4da3a292039d772eba32b43048fe50e7f7377b.

Bug 1037683
Bug 1030415

Change-Id: Ibf77384ee62bb34e6fa34a1670ea3f0803dcd25e
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/127084
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

drivers/video/tegra/dc/dc.c

index da7f291..c33858a 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) {
-               dc->enabled = _tegra_dc_enable(dc);
                _tegra_dc_set_default_videomode(dc);
+               dc->enabled = _tegra_dc_enable(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_enable(dc);
                _tegra_dc_set_default_videomode(dc);
+               _tegra_dc_enable(dc);
        }
 
        if (dc->out && dc->out->hotplug_init)