summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-04-23 11:30:55 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-04-24 13:52:51 +0200
commita14005555c2da43f8094a6b317b8ec05653c0880 (patch)
tree3f514a64025ee199025dc5c5067991f63e45e8a9
parentcd10a3adde3303d7a5136871cc120b3cbc7869fc (diff)
Revert "ARM: dts: imx8: apalis-imx8qm: hack to make weston happy"
This reverts commit 82aaeaf1d8b8d0ea83d2c6c404656d2bf7c918af. As we further progressed on this HDMI DDC/EDID issue we will solve this in a smarter way by a subsequent commit "drm/imx/hdp: implement optional regular ddc/edid i2c bus handling".
-rw-r--r--drivers/gpu/drm/imx/hdp/imx-hdp.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/imx/hdp/imx-hdp.c b/drivers/gpu/drm/imx/hdp/imx-hdp.c
index b3dbc7eec3e5..1152c9aaff07 100644
--- a/drivers/gpu/drm/imx/hdp/imx-hdp.c
+++ b/drivers/gpu/drm/imx/hdp/imx-hdp.c
@@ -834,12 +834,7 @@ imx_hdp_connector_detect(struct drm_connector *connector, bool force)
ret = imx_hdp_call(hdp, get_hpd_state, &hdp->state, &hpd);
if (ret > 0)
-#if 0
return connector_status_unknown;
-#else
-//TBD: make Weston happy
- return connector_status_connected;
-#endif
if (hpd == 1)
/* Cable Connected */