drm/msm/hdmi: Fix HDMI pink strip issue seen on 8x96

A 2 pixel wide pink strip was observed on the left end of some HDMI
monitors configured in a HDMI mode.

It turned out that we were missing out on configuring AVI infoframes, and
unlike APQ8064, the 8x96 HDMI H/W seems to be sensitive to that.

Add configuration of AVI infoframes. While at it, make sure that
hdmi_audio_update is only called when we've detected that the monitor
supports HDMI.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
index 4e6d1bf27474dbe027cde9b9b3151995a39d9da3..ae40e7179d4f5f21cbdef9401d68b2e09d954a7f 100644 (file)
--- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
@@ -86,6 +86,65 @@ static void power_off(struct drm_bridge *bridge)
        }
 }
 
+#define AVI_IFRAME_LINE_NUMBER 1
+
+static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi)
+{
+       struct drm_crtc *crtc = hdmi->encoder->crtc;
+       const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
+       union hdmi_infoframe frame;
+       u8 buffer[HDMI_INFOFRAME_SIZE(AVI)];
+       u32 val;
+       int len;
+
+       drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, mode);
+
+       len = hdmi_infoframe_pack(&frame, buffer, sizeof(buffer));
+       if (len < 0) {
+               dev_err(&hdmi->pdev->dev,
+                       "failed to configure avi infoframe\n");
+               return;
+       }
+
+       /*
+        * the AVI_INFOx registers don't map exactly to how the AVI infoframes
+        * are packed according to the spec. The checksum from the header is
+        * written to the LSB byte of AVI_INFO0 and the version is written to
+        * the third byte from the LSB of AVI_INFO3
+        */
+       hdmi_write(hdmi, REG_HDMI_AVI_INFO(0),
+                  buffer[3] |
+                  buffer[4] << 8 |
+                  buffer[5] << 16 |
+                  buffer[6] << 24);
+
+       hdmi_write(hdmi, REG_HDMI_AVI_INFO(1),
+                  buffer[7] |
+                  buffer[8] << 8 |
+                  buffer[9] << 16 |
+                  buffer[10] << 24);
+
+       hdmi_write(hdmi, REG_HDMI_AVI_INFO(2),
+                  buffer[11] |
+                  buffer[12] << 8 |
+                  buffer[13] << 16 |
+                  buffer[14] << 24);
+
+       hdmi_write(hdmi, REG_HDMI_AVI_INFO(3),
+                  buffer[15] |
+                  buffer[16] << 8 |
+                  buffer[1] << 24);
+
+       hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL0,
+                  HDMI_INFOFRAME_CTRL0_AVI_SEND |
+                  HDMI_INFOFRAME_CTRL0_AVI_CONT);
+
+       val = hdmi_read(hdmi, REG_HDMI_INFOFRAME_CTRL1);
+       val &= ~HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE__MASK;
+       val |= HDMI_INFOFRAME_CTRL1_AVI_INFO_LINE(AVI_IFRAME_LINE_NUMBER);
+       hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL1, val);
+}
+
 static void msm_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
 {
        struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
@@ -98,7 +157,10 @@ static void msm_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
                msm_hdmi_phy_resource_enable(phy);
                msm_hdmi_power_on(bridge);
                hdmi->power_on = true;
-               msm_hdmi_audio_update(hdmi);
+               if (hdmi->hdmi_mode) {
+                       msm_hdmi_config_avi_infoframe(hdmi);
+                       msm_hdmi_audio_update(hdmi);
+               }
        }
 
        msm_hdmi_phy_powerup(phy, hdmi->pixclock);
@@ -134,7 +196,8 @@ static void msm_hdmi_bridge_post_disable(struct drm_bridge *bridge)
        if (hdmi->power_on) {
                power_off(bridge);
                hdmi->power_on = false;
-               msm_hdmi_audio_update(hdmi);
+               if (hdmi->hdmi_mode)
+                       msm_hdmi_audio_update(hdmi);
                msm_hdmi_phy_resource_disable(phy);
        }
 }
@@ -196,7 +259,8 @@ static void msm_hdmi_bridge_mode_set(struct drm_bridge *bridge,
        DBG("frame_ctrl=%08x", frame_ctrl);
        hdmi_write(hdmi, REG_HDMI_FRAME_CTRL, frame_ctrl);
 
-       msm_hdmi_audio_update(hdmi);
+       if (hdmi->hdmi_mode)
+               msm_hdmi_audio_update(hdmi);
 }
 
 static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = {