diff options
| author | Erik Gilling <konkers@android.com> | 2011-04-07 16:54:01 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-04-07 16:54:31 -0700 |
| commit | 30ff24c355ab4cc4f4794f285e1486e90a771d26 (patch) | |
| tree | 9a37893d6939d3a2ab6c1ba1710b021778e63ba9 | |
| parent | 8426dbfc3a189907ce3a309065ebd6126ac0d555 (diff) | |
| parent | 98ed9cb6c4bc11a844edfb5d993568cbf77fe737 (diff) | |
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I0dea4f256442d7391808de8456fe35d3879682fe
| -rw-r--r-- | drivers/video/tegra/dc/nvhdcp.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c index 2229c6b93ad3..faa15c6081fc 100644 --- a/drivers/video/tegra/dc/nvhdcp.c +++ b/drivers/video/tegra/dc/nvhdcp.c @@ -1016,20 +1016,6 @@ err: return; } -void tegra_nvhdcp_set_plug(struct tegra_nvhdcp *nvhdcp, bool hpd) -{ - nvhdcp_debug("hdmi hotplug detected (hpd = %d)\n", hpd); - - nvhdcp_set_plugged(nvhdcp, hpd); - - if (hpd) { - nvhdcp->fail_count = 0; - queue_work(nvhdcp->downstream_wq, &nvhdcp->work); - } else { - flush_workqueue(nvhdcp->downstream_wq); - } -} - static int tegra_nvhdcp_on(struct tegra_nvhdcp *nvhdcp) { nvhdcp->state = STATE_UNAUTHENTICATED; @@ -1050,6 +1036,18 @@ static int tegra_nvhdcp_off(struct tegra_nvhdcp *nvhdcp) return 0; } +void tegra_nvhdcp_set_plug(struct tegra_nvhdcp *nvhdcp, bool hpd) +{ + nvhdcp_debug("hdmi hotplug detected (hpd = %d)\n", hpd); + + if (hpd) { + nvhdcp_set_plugged(nvhdcp, true); + tegra_nvhdcp_on(nvhdcp); + } else { + tegra_nvhdcp_off(nvhdcp); + } +} + int tegra_nvhdcp_set_policy(struct tegra_nvhdcp *nvhdcp, int pol) { if (pol == TEGRA_NVHDCP_POLICY_ALWAYS_ON) { |