From: Mark Yao <mark.yao@rock-chips.com>
Date: Mon, 17 Apr 2017 03:00:18 +0000 (+0800)
Subject: drm/bridge: analogix: fix edid not works
X-Git-Tag: firefly_0821_release~10
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=14c0ac324068534d9c256bd8dd2f54e0a8173e24

drm/bridge: analogix: fix edid not works

Change-Id: I1a964b51d0d137e66ad5d073a2eef2fb22770bba
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 6ac31a9f8260..ff2b881581c5 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -938,9 +938,10 @@ int analogix_dp_get_modes(struct drm_connector *connector)
 
 	pm_runtime_get_sync(dp->dev);
 
-	if (dp->plat_data->panel) {
+	if (dp->plat_data->panel)
 		num_modes += drm_panel_get_modes(dp->plat_data->panel);
-	} else if (analogix_dp_handle_edid(dp) == 0) {
+
+	if (!num_modes && !analogix_dp_handle_edid(dp)) {
 		drm_mode_connector_update_edid_property(&dp->connector, edid);
 		num_modes += drm_add_edid_modes(&dp->connector, edid);
 	}