summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorJon Mayo <jmayo@nvidia.com>2014-04-16 10:30:20 -0700
committerSeema Khowala <seemaj@nvidia.com>2014-04-23 14:06:37 -0700
commit9301b9ef329a7e13cb34dd7a6e638c060c0a3bad (patch)
treed75895ee491c15ca776d8c0dba7fec1ae6afd528 /drivers/video
parentd5736a1cfd29f645148acecadd2a43d7861f24e1 (diff)
video: tegra: dc: optimize resume for hotplug devs
Optimize the resume path to only use the 100ms work around delay for outputs that support hotplug wake and only when a panels is connected. Bug 1494970 Change-Id: I0ea449cfd8eff162b7752fbc3f4c4f462f54b915 Signed-off-by: Jon Mayo <jmayo@nvidia.com> Reviewed-on: http://git-master/r/397468 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tegra/dc/dc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 57f9fa935122..a19b0cad9b9a 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -3300,10 +3300,13 @@ static int tegra_dc_suspend(struct platform_device *ndev, pm_message_t state)
if (dc->out && dc->out->postsuspend) {
dc->out->postsuspend();
- if (dc->out->type && dc->out->type == TEGRA_DC_OUT_HDMI)
- /*
- * avoid resume event due to voltage falling
- */
+ /* avoid resume event due to voltage falling on interfaces that
+ * support hotplug wake. And only do this if a panel is
+ * connected, if we are already disconnected, then no phantom
+ * hotplug can occur by disabling the voltage.
+ */
+ if ((dc->out->flags & TEGRA_DC_OUT_HOTPLUG_WAKE_LP0)
+ && tegra_dc_get_connected(dc))
msleep(100);
}