Use the DDC connection to read the EDID from the eDP panel instead of
relying on the panel to tell us the modes.

Reviewed-by: Douglas Anderson <diand...@chromium.org>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Jonas Karlman <jo...@kwiboo.se>
Cc: Jernej Skrabec <jernej.skra...@siol.net>
Cc: Sean Paul <seanp...@chromium.org>
Signed-off-by: Stephen Boyd <swb...@chromium.org>
---
 drivers/gpu/drm/bridge/ti-sn65dsi86.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c 
b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
index c77f46a21aae..f86934fd6cc8 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -119,6 +119,7 @@
  * @debugfs:      Used for managing our debugfs.
  * @host_node:    Remote DSI node.
  * @dsi:          Our MIPI DSI source.
+ * @edid:         Detected EDID of eDP panel.
  * @refclk:       Our reference clock.
  * @panel:        Our panel.
  * @enable_gpio:  The GPIO we toggle to enable the bridge.
@@ -144,6 +145,7 @@ struct ti_sn_bridge {
        struct drm_bridge               bridge;
        struct drm_connector            connector;
        struct dentry                   *debugfs;
+       struct edid                     *edid;
        struct device_node              *host_node;
        struct mipi_dsi_device          *dsi;
        struct clk                      *refclk;
@@ -265,6 +267,23 @@ connector_to_ti_sn_bridge(struct drm_connector *connector)
 static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector)
 {
        struct ti_sn_bridge *pdata = connector_to_ti_sn_bridge(connector);
+       struct edid *edid = pdata->edid;
+       int num, ret;
+
+       if (!edid) {
+               pm_runtime_get_sync(pdata->dev);
+               edid = pdata->edid = drm_get_edid(connector, &pdata->aux.ddc);
+               pm_runtime_put(pdata->dev);
+       }
+
+       if (edid && drm_edid_is_valid(edid)) {
+               ret = drm_connector_update_edid_property(connector, edid);
+               if (!ret) {
+                       num = drm_add_edid_modes(connector, edid);
+                       if (num)
+                               return num;
+               }
+       }
 
        return drm_panel_get_modes(pdata->panel, connector);
 }
@@ -1245,6 +1264,7 @@ static int ti_sn_bridge_remove(struct i2c_client *client)
        if (!pdata)
                return -EINVAL;
 
+       kfree(pdata->edid);
        ti_sn_debugfs_remove(pdata);
 
        of_node_put(pdata->host_node);
-- 
Sent by a computer, using git, on the internet

Reply via email to