omapdrm: hdmi4: refcount hdmi_power_on/off_core
The hdmi_power_on/off_core functions can be called multiple times: when the HPD changes and when the HDMI CEC support needs to power the HDMI core. So use a counter to know when to really power on or off the HDMI core. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Родитель
1d54ecf230
Коммит
a141a29612
|
@ -124,9 +124,12 @@ static int hdmi_power_on_core(struct omap_dss_device *dssdev)
|
||||||
{
|
{
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
if (hdmi.core.core_pwr_cnt++)
|
||||||
|
return 0;
|
||||||
|
|
||||||
r = regulator_enable(hdmi.vdda_reg);
|
r = regulator_enable(hdmi.vdda_reg);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
goto err_reg_enable;
|
||||||
|
|
||||||
r = hdmi_runtime_get();
|
r = hdmi_runtime_get();
|
||||||
if (r)
|
if (r)
|
||||||
|
@ -143,12 +146,17 @@ static int hdmi_power_on_core(struct omap_dss_device *dssdev)
|
||||||
|
|
||||||
err_runtime_get:
|
err_runtime_get:
|
||||||
regulator_disable(hdmi.vdda_reg);
|
regulator_disable(hdmi.vdda_reg);
|
||||||
|
err_reg_enable:
|
||||||
|
hdmi.core.core_pwr_cnt--;
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hdmi_power_off_core(struct omap_dss_device *dssdev)
|
static void hdmi_power_off_core(struct omap_dss_device *dssdev)
|
||||||
{
|
{
|
||||||
|
if (--hdmi.core.core_pwr_cnt)
|
||||||
|
return;
|
||||||
|
|
||||||
hdmi.core_enabled = false;
|
hdmi.core_enabled = false;
|
||||||
|
|
||||||
hdmi_runtime_put();
|
hdmi_runtime_put();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче