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>

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index 91c2a1e8b324a835d6f587c8ce5d00c22f92523f..fd1b252c6e6d7d79d55937a5ff0d66bf0f8a70e9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -124,9 +124,12 @@ static int hdmi_power_on_core(struct omap_dss_device *dssdev)
 {
        int r;
 
+       if (hdmi.core.core_pwr_cnt++)
+               return 0;
+
        r = regulator_enable(hdmi.vdda_reg);
        if (r)
-               return r;
+               goto err_reg_enable;
 
        r = hdmi_runtime_get();
        if (r)
@@ -143,12 +146,17 @@ static int hdmi_power_on_core(struct omap_dss_device *dssdev)
 
 err_runtime_get:
        regulator_disable(hdmi.vdda_reg);
+err_reg_enable:
+       hdmi.core.core_pwr_cnt--;
 
        return r;
 }
 
 static void hdmi_power_off_core(struct omap_dss_device *dssdev)
 {
+       if (--hdmi.core.core_pwr_cnt)
+               return;
+
        hdmi.core_enabled = false;
 
        hdmi_runtime_put();