diff options
| author | Sanjay Singh Rawat <srawat@nvidia.com> | 2011-07-06 13:11:28 +0530 |
|---|---|---|
| committer | Manish Tuteja <mtuteja@nvidia.com> | 2011-07-22 03:52:10 -0700 |
| commit | f379591996a1220bd2f213a70f8129eebf0b30f0 (patch) | |
| tree | 7fe887aa04fa1841f8d7a8ec47ce9f42f3897f76 | |
| parent | 9a3993d39599d1637d7c04218e6a634f914e9f91 (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: Ifcdeb340d953b288bdfee224f3b0f0f3caab98c1
Reviewed-on: http://git-master/r/40808
Tested-by: Sanjay Singh Rawat <srawat@nvidia.com>
Reviewed-by: Gaurav Sarode <gsarode@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
| -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 f36dd8de9f0a..c93b3c4c72f1 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -641,6 +641,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); |