diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2011-11-21 13:14:31 -0800 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-08 17:55:39 +0530 |
| commit | 171d61d7e574f83f7f59affb4d3b8edecd5dd587 (patch) | |
| tree | ee3dc5fe906c1baa25e95c287d433aea854ff47e /drivers/video/tegra/dc/hdmi.c | |
| parent | 769fccb52649fe0462f0067ee2cbe678e8ddfc70 (diff) | |
video: tegra: dc: use Kconfig to enable nvhdcp
Use TEGRA_NVHDCP to enable/disable support for NVHDCP on HDMI.
Change-Id: If65267e7a4c82c5497271c19ac985bfa8881bca1
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/67883
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index c2584a143a30..e12c16851368 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -1009,6 +1009,7 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) goto err_free_irq; } +#ifdef CONFIG_TEGRA_NVHDCP hdmi->nvhdcp = tegra_nvhdcp_create(hdmi, dc->ndev->id, dc->out->dcc_bus); if (IS_ERR_OR_NULL(hdmi->nvhdcp)) { @@ -1016,6 +1017,9 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) err = PTR_ERR(hdmi->nvhdcp); goto err_edid_destroy; } +#else + hdmi->nvhdcp = NULL; +#endif INIT_DELAYED_WORK(&hdmi->work, tegra_dc_hdmi_detect_worker); |