diff options
| author | Sanjay Singh Rawat <srawat@nvidia.com> | 2011-07-06 13:11:28 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:49 -0800 |
| commit | 313a5ea92d6a703fb85d506ca7979a6bf1104305 (patch) | |
| tree | dd2a7e3ffb9faf72c33825c539f3537dac73d33f /drivers/video/tegra/dc/hdmi.c | |
| parent | 2b36b250e164643205e9a182f6e1e28aed2c1b80 (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)
Original-Change-Id: Idee461e66edce494214814ced3854f716e8a44e3
Reviewed-on: http://git-master/r/41545
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R01d0a5d61afb386240ae35da73fe12f38e26ed28
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
| -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 7c146585bd74..528a14ba33c5 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -814,6 +814,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); |