GFX-Display: make HDMI display in 1920x1080p@60Hz as default on CLV for MWC demo.

BZ: 24203

Don't filter out the 1920x1080p@60Hz mode whose dot clock is 148.5 MHz = 2200 x 1125 x 60.

Change-Id: Iaf1a6fc800ae7031b4ede7ddcf6ccb76c45a36a1
Signed-off-by: Austin Hu <austin.hu@intel.com>
Reviewed-on: http://android.intel.com:8080/35712
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
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 115bc55..acdaa92 100644 (file)
--- a/drivers/staging/mrst/drv/psb_intel_hdmi.c
+++ b/drivers/staging/mrst/drv/psb_intel_hdmi.c
@@ -1865,12 +1865,19 @@ static int mdfld_hdmi_get_modes(struct drm_connector *connector)
 static int mdfld_hdmi_mode_valid(struct drm_connector *connector,
                                 struct drm_display_mode *mode)
 {
+       struct drm_device *dev = connector->dev;
+
        PSB_DEBUG_ENTRY("display info. hdisplay = %d, vdisplay = %d, vrefresh = %d.\n",
                        mode->hdisplay, mode->vdisplay, mode->vrefresh);
 
        /* change the maximum clock to be 74.25mhz per DC spec */
-        if (mode->clock > 74250)
-                return MODE_CLOCK_HIGH;
+       if (IS_CTP(dev)) {
+               if (mode->clock > 165000)
+                       return MODE_CLOCK_HIGH;
+       } else {
+               if (mode->clock > 74250)
+                       return MODE_CLOCK_HIGH;
+       }
 
        if (mode->clock < 20000)
                return MODE_CLOCK_LOW;