drm/bridge: sii902x: Set output mode to HDMI or DVI according to EDID

Set output mode to HDMI or DVI according to EDID HDMI signature.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c42838073b83185a5cf9949caab3c70ee093b791.1558964241.git.jsarha@ti.com

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 0d3d730b97ffe63b53c60e0d047786ec6ed17e42..2ced4f404cae3b45c10b57bf5b2f97513d893c67 100644 (file)
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -181,12 +181,16 @@ static int sii902x_get_modes(struct drm_connector *connector)
 {
        struct sii902x *sii902x = connector_to_sii902x(connector);
        u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+       u8 output_mode = SII902X_SYS_CTRL_OUTPUT_DVI;
        struct edid *edid;
        int num = 0, ret;
 
        edid = drm_get_edid(connector, sii902x->i2cmux->adapter[0]);
        drm_connector_update_edid_property(connector, edid);
        if (edid) {
+               if (drm_detect_hdmi_monitor(edid))
+                       output_mode = SII902X_SYS_CTRL_OUTPUT_HDMI;
+
                num = drm_add_edid_modes(connector, edid);
                kfree(edid);
        }
@@ -196,6 +200,11 @@ static int sii902x_get_modes(struct drm_connector *connector)
        if (ret)
                return ret;
 
+       ret = regmap_update_bits(sii902x->regmap, SII902X_SYS_CTRL_DATA,
+                                SII902X_SYS_CTRL_OUTPUT_MODE, output_mode);
+       if (ret)
+               return ret;
+
        return num;
 }