Merge tag 'JH7110_515_SDK_v5.0.3' into vf2-515-devel-v3.0.xVF2_v3.0.4

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/verisilicon/inno_hdmi.c b/drivers/gpu/drm/verisilicon/inno_hdmi.c
index 6070bcf4c6db..66a2627462da 100644..100755
--- a/drivers/gpu/drm/verisilicon/inno_hdmi.c
+++ b/drivers/gpu/drm/verisilicon/inno_hdmi.c
@@ -660,6 +660,7 @@ inno_hdmi_connector_detect(struct drm_connector *connector, bool force)
 	ret = pm_runtime_get_sync(hdmi->dev);
 	if (ret < 0)
 		return ret;
+	mdelay(500);
 	ret = (hdmi_readb(hdmi, HDMI_STATUS) & m_HOTPLUG) ?
 		connector_status_connected : connector_status_disconnected;
 
@@ -700,6 +701,9 @@ inno_hdmi_connector_mode_valid(struct drm_connector *connector,
 
 	for (i = 0; cfg[i].pixclock != (~0UL); i++) {
 		if (pclk == cfg[i].pixclock) {
+			if (pclk > 297000 * 1000) {
+				continue;
+			}
 			valid = true;
 			break;
 		}