Commit 18ebc0f4 authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Thierry Reding

drm/tegra: hdmi: Enable VDD earlier for hotplug/DDC

The VDD regulator used to be enabled only at tegra_output_hdmi_enable,
which is called after a sink is detected. However, the HDMI hotplug pin
works by returning the voltage supplied by the VDD pin, so this meant
that the hotplug pin was never asserted and the sink was not detected
unless the VDD regulator was set to be always on.

This patch moves the enable to the tegra_hdmi_init() function to make
sure the regulator will get enabled and therefore ensure proper hotplug
detection.
Signed-off-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent ef284c75
...@@ -705,12 +705,6 @@ static int tegra_output_hdmi_enable(struct tegra_output *output) ...@@ -705,12 +705,6 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
h_back_porch = mode->htotal - mode->hsync_end; h_back_porch = mode->htotal - mode->hsync_end;
h_front_porch = mode->hsync_start - mode->hdisplay; h_front_porch = mode->hsync_start - mode->hdisplay;
err = regulator_enable(hdmi->vdd);
if (err < 0) {
dev_err(hdmi->dev, "failed to enable VDD regulator: %d\n", err);
return err;
}
err = regulator_enable(hdmi->pll); err = regulator_enable(hdmi->pll);
if (err < 0) { if (err < 0) {
dev_err(hdmi->dev, "failed to enable PLL regulator: %d\n", err); dev_err(hdmi->dev, "failed to enable PLL regulator: %d\n", err);
...@@ -921,7 +915,6 @@ static int tegra_output_hdmi_disable(struct tegra_output *output) ...@@ -921,7 +915,6 @@ static int tegra_output_hdmi_disable(struct tegra_output *output)
tegra_periph_reset_assert(hdmi->clk); tegra_periph_reset_assert(hdmi->clk);
clk_disable(hdmi->clk); clk_disable(hdmi->clk);
regulator_disable(hdmi->pll); regulator_disable(hdmi->pll);
regulator_disable(hdmi->vdd);
return 0; return 0;
} }
...@@ -1226,6 +1219,13 @@ static int tegra_hdmi_init(struct host1x_client *client) ...@@ -1226,6 +1219,13 @@ static int tegra_hdmi_init(struct host1x_client *client)
struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client);
int err; int err;
err = regulator_enable(hdmi->vdd);
if (err < 0) {
dev_err(client->dev, "failed to enable VDD regulator: %d\n",
err);
return err;
}
hdmi->output.type = TEGRA_OUTPUT_HDMI; hdmi->output.type = TEGRA_OUTPUT_HDMI;
hdmi->output.dev = client->dev; hdmi->output.dev = client->dev;
hdmi->output.ops = &hdmi_ops; hdmi->output.ops = &hdmi_ops;
...@@ -1269,6 +1269,8 @@ static int tegra_hdmi_exit(struct host1x_client *client) ...@@ -1269,6 +1269,8 @@ static int tegra_hdmi_exit(struct host1x_client *client)
return err; return err;
} }
regulator_disable(hdmi->vdd);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment