GFX-Display: fixed the issue that HDMI displays nothing after DPMS off/on with some...

BZ: 34946

Fixed by setting HDMI AVI info frame in HDMI encoder DPMS on process,
to restore the VIDEO_DIP_CTL DC register.

Change-Id: I1d2a646fba694f70150e32ed49e95cb96e3e9fd4
Signed-off-by: Austin Hu <austin.hu@intel.com>
Signed-off-by: Tong, Bo <box.tong@intel.com>
Reviewed-on: http://android.intel.com:8080/46664
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/staging/mrst/drv/psb_intel_hdmi.c b/drivers/staging/mrst/drv/psb_intel_hdmi.c
index 561ab8b..db7229f 100644 (file)
--- a/drivers/staging/mrst/drv/psb_intel_hdmi.c
+++ b/drivers/staging/mrst/drv/psb_intel_hdmi.c
@@ -828,6 +828,10 @@ static void mdfld_hdmi_dpms(struct drm_encoder *encoder, int mode)
                REG_WRITE(hdmi_priv->hdmib_reg,
                                hdmib | HDMIB_PORT_EN);
 
+               if (!dev_priv->bDVIport)
+                       mdfld_hdmi_set_avi_infoframe(dev, &output->base,
+                                       hdmi_priv->current_mode);
+
                if (dev_priv->mdfld_had_event_callbacks
                        && !dev_priv->bDVIport
                        && (hdmip_enabled == 0))