diff options
| author | Chao Xu <cxu@nvidia.com> | 2013-12-05 12:09:02 -0800 |
|---|---|---|
| committer | Chao Xu <cxu@nvidia.com> | 2014-01-08 13:28:02 -0800 |
| commit | df0d511ca4a378083b7b1b04004dd25a431fecd9 (patch) | |
| tree | eb26839f702884534c9cf866a475bf7c48d51b45 /drivers/video/tegra/dc/hdmi.c | |
| parent | a4e8918b8179e1ec2250aaf8ec56709969b806ca (diff) | |
video: tegra: dc: Enable dc_get_edid() for all SORs
Current tegra_dc_get_edid() only works for hdmi. Add the edid reference
to DC and move the functions to edid.c so this function can be used for
DP and other devices as well.
Bug 1389863
Change-Id: If7d007720dc1bce307758b82bb19e2d27ae5109e
Signed-off-by: Chao Xu <cxu@nvidia.com>
Reviewed-on: http://git-master/r/339460
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 79249ecf33fd..6419cb7fd93c 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -981,6 +981,7 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) err = PTR_ERR(hdmi->edid); goto err_put_clock; } + tegra_dc_set_edid(dc, hdmi->edid); adapter = i2c_get_adapter(dc->out->dcc_bus); if (!adapter) { @@ -2036,26 +2037,6 @@ struct tegra_dc_out_ops tegra_dc_hdmi_ops = { .setup_clk = tegra_dc_hdmi_setup_clk, }; -struct tegra_dc_edid *tegra_dc_get_edid(struct tegra_dc *dc) -{ - struct tegra_dc_hdmi_data *hdmi; - - /* TODO: Support EDID on non-HDMI devices */ - if (dc->out->type != TEGRA_DC_OUT_HDMI) - return ERR_PTR(-ENODEV); - - hdmi = tegra_dc_get_outdata(dc); - - return tegra_edid_get_data(hdmi->edid); -} -EXPORT_SYMBOL(tegra_dc_get_edid); - -void tegra_dc_put_edid(struct tegra_dc_edid *edid) -{ - tegra_edid_put_data(edid); -} -EXPORT_SYMBOL(tegra_dc_put_edid); - struct tegra_dc *tegra_dc_hdmi_get_dc(struct tegra_dc_hdmi_data *hdmi) { return hdmi ? hdmi->dc : NULL; |