Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / bridge / dw_hdmi.c

diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index cef31d5cacb3c922a80d5c42d2f5467dc979bde0..0083d4e7e7e2792a06a67956858b1d1eaf8f983e 100644 (file)
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -125,6 +125,9 @@ struct dw_hdmi {
        bool sink_is_hdmi;
        bool sink_has_audio;
 
+       struct mutex mutex;             /* for state below and previous_mode */
+       bool disabled;                  /* DRM has disabled our bridge */
+
        spinlock_t audio_lock;
        struct mutex audio_mutex;
        unsigned int sample_rate;
@@ -1375,8 +1378,12 @@ static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,
 {
        struct dw_hdmi *hdmi = bridge->driver_private;
 
+       mutex_lock(&hdmi->mutex);
+
        /* Store the display mode for plugin/DKMS poweron events */
        memcpy(&hdmi->previous_mode, mode, sizeof(hdmi->previous_mode));
+
+       mutex_unlock(&hdmi->mutex);
 }
 
 static bool dw_hdmi_bridge_mode_fixup(struct drm_bridge *bridge,
@@ -1390,14 +1397,20 @@ static void dw_hdmi_bridge_disable(struct drm_bridge *bridge)
 {
        struct dw_hdmi *hdmi = bridge->driver_private;
 
+       mutex_lock(&hdmi->mutex);
+       hdmi->disabled = true;
        dw_hdmi_poweroff(hdmi);
+       mutex_unlock(&hdmi->mutex);
 }
 
 static void dw_hdmi_bridge_enable(struct drm_bridge *bridge)
 {
        struct dw_hdmi *hdmi = bridge->driver_private;
 
+       mutex_lock(&hdmi->mutex);
        dw_hdmi_poweron(hdmi);
+       hdmi->disabled = false;
+       mutex_unlock(&hdmi->mutex);
 }
 
 static void dw_hdmi_bridge_nop(struct drm_bridge *bridge)
@@ -1420,7 +1433,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
        struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
                                             connector);
        struct edid *edid;
-       int ret;
+       int ret = 0;
 
        if (!hdmi->ddc)
                return 0;
@@ -1439,7 +1452,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
                dev_dbg(hdmi->dev, "failed to get edid\n");
        }
 
-       return 0;
+       return ret;
 }
 
 static enum drm_mode_status
@@ -1488,7 +1501,7 @@ static struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = {
        .best_encoder = dw_hdmi_connector_best_encoder,
 };
 
-struct drm_bridge_funcs dw_hdmi_bridge_funcs = {
+static struct drm_bridge_funcs dw_hdmi_bridge_funcs = {
        .enable = dw_hdmi_bridge_enable,
        .disable = dw_hdmi_bridge_disable,
        .pre_enable = dw_hdmi_bridge_nop,
@@ -1520,20 +1533,20 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
        phy_int_pol = hdmi_readb(hdmi, HDMI_PHY_POL0);
 
        if (intr_stat & HDMI_IH_PHY_STAT0_HPD) {
+               hdmi_modb(hdmi, ~phy_int_pol, HDMI_PHY_HPD, HDMI_PHY_POL0);
+               mutex_lock(&hdmi->mutex);
                if (phy_int_pol & HDMI_PHY_HPD) {
                        dev_dbg(hdmi->dev, "EVENT=plugin\n");
 
-                       hdmi_modb(hdmi, 0, HDMI_PHY_HPD, HDMI_PHY_POL0);
-
-                       dw_hdmi_poweron(hdmi);
+                       if (!hdmi->disabled)
+                               dw_hdmi_poweron(hdmi);
                } else {
                        dev_dbg(hdmi->dev, "EVENT=plugout\n");
 
-                       hdmi_modb(hdmi, HDMI_PHY_HPD, HDMI_PHY_HPD,
-                                 HDMI_PHY_POL0);
-
-                       dw_hdmi_poweroff(hdmi);
+                       if (!hdmi->disabled)
+                               dw_hdmi_poweroff(hdmi);
                }
+               mutex_unlock(&hdmi->mutex);
                drm_helper_hpd_irq_event(hdmi->bridge->dev);
        }
 
@@ -1601,7 +1614,9 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
        hdmi->sample_rate = 48000;
        hdmi->ratio = 100;
        hdmi->encoder = encoder;
+       hdmi->disabled = true;
 
+       mutex_init(&hdmi->mutex);
        mutex_init(&hdmi->audio_mutex);
        spin_lock_init(&hdmi->audio_lock);