diff options
| author | Sanjay Singh Rawat <srawat@nvidia.com> | 2011-07-06 13:11:28 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-22 17:35:32 -0700 |
| commit | 780d0b2662c0f70e358a535ec4fffea4881771c6 (patch) | |
| tree | 9bd294e645d5dd41f2c28352c7e4f20194e5440c /drivers | |
| parent | 7448aa61651f6c105ec08f64458b2ec2e5e05bf6 (diff) | |
video: tegra: check for hdmi peripheral during resume
As HDMI is not a wakeup source. To detect HDMI peripheral which is
connected after suspend, we scan for it during HDMI resume.
Bug 846365
Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com>
Reviewed-on: http://git-master/r/39776
(cherry picked from commit fd1134f413845f8e0b3944153eb7406f713a9709)
Change-Id: Idee461e66edce494214814ced3854f716e8a44e3
Reviewed-on: http://git-master/r/41545
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 5bcf3debc193..0a365bf35d95 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -823,6 +823,9 @@ static void tegra_dc_hdmi_resume(struct tegra_dc *dc) queue_delayed_work(system_nrt_wq, &hdmi->work, msecs_to_jiffies(30)); hdmi->hpd_pending = false; + } else if (tegra_dc_hdmi_hpd(dc)) { /* Check for HDMI Peripheral */ + queue_delayed_work(system_nrt_wq, &hdmi->work, + msecs_to_jiffies(100)); } spin_unlock_irqrestore(&hdmi->suspend_lock, flags); tegra_nvhdcp_resume(hdmi->nvhdcp); |