From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Andrzej Hajda <a.hajda@samsung.com>, Neil Armstrong <narmstrong@baylibre.com>, Jonas Karlman <jonas@kwiboo.se>, Jernej Skrabec <jernej.skrabec@siol.net>, Douglas Anderson <dianders@chromium.org>, Stephen Boyd <swboyd@chromium.org> Subject: [RFC PATCH 10/11] drm/bridge: ti-sn65dsi86: Support DisplayPort (non-eDP) mode Date: Mon, 22 Mar 2021 05:01:27 +0200 [thread overview] Message-ID: <20210322030128.2283-11-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20210322030128.2283-1-laurent.pinchart+renesas@ideasonboard.com> Despite the SN65DSI86 being an eDP bridge, on some systems its output is routed to a DisplayPort connector. Enable DisplayPort mode when the next component in the display pipeline is not a panel, and disable eDP features in that case. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 32 ++++++++++++++++++++------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index e2527d597ccb..f792227142a7 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -55,6 +55,7 @@ #define SN_LN_ASSIGN_REG 0x59 #define LN_ASSIGN_WIDTH 2 #define SN_ENH_FRAME_REG 0x5A +#define ASSR_CONTROL BIT(0) #define VSTREAM_ENABLE BIT(3) #define LN_POLRS_OFFSET 4 #define LN_POLRS_MASK 0xf0 @@ -86,6 +87,8 @@ #define SN_DATARATE_CONFIG_REG 0x94 #define DP_DATARATE_MASK GENMASK(7, 5) #define DP_DATARATE(x) ((x) << 5) +#define SN_TRAINING_SETTING_REG 0x95 +#define SCRAMBLE_DISABLE BIT(4) #define SN_ML_TX_MODE_REG 0x96 #define ML_TX_MAIN_LINK_OFF 0 #define ML_TX_NORMAL_MODE BIT(0) @@ -723,6 +726,11 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata, int dp_rate_idx, regmap_update_bits(pdata->regmap, SN_DATARATE_CONFIG_REG, DP_DATARATE_MASK, DP_DATARATE(dp_rate_idx)); + /* For DisplayPort, use the standard DP scrambler seed. */ + if (pdata->bridge.type == DRM_MODE_CONNECTOR_DisplayPort) + regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, + ASSR_CONTROL, 0); + /* enable DP PLL */ regmap_write(pdata->regmap, SN_PLL_ENABLE_REG, 1); @@ -734,6 +742,11 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata, int dp_rate_idx, goto exit; } + /* For DisplayPort, disable scrambling mode. */ + if (pdata->bridge.type == DRM_MODE_CONNECTOR_DisplayPort) + regmap_update_bits(pdata->regmap, SN_TRAINING_SETTING_REG, + SCRAMBLE_DISABLE, SCRAMBLE_DISABLE); + /* * We'll try to link train several times. As part of link training * the bridge chip will write DP_SET_POWER_D0 to DP_SET_POWER. If @@ -1288,18 +1301,20 @@ static int ti_sn_bridge_probe(struct i2c_client *client, pdata->dev = &client->dev; ret = drm_of_find_panel_or_bridge(pdata->dev->of_node, 1, 0, - &pdata->panel, NULL); + &pdata->panel, &pdata->next_bridge); if (ret) { DRM_ERROR("could not find any panel node\n"); return ret; } - pdata->next_bridge = devm_drm_panel_bridge_add(pdata->dev, - pdata->panel); - if (IS_ERR(pdata->next_bridge)) { - DRM_ERROR("failed to create panel bridge\n"); - ret = PTR_ERR(pdata->next_bridge); - return ret; + if (!pdata->next_bridge) { + pdata->next_bridge = devm_drm_panel_bridge_add(pdata->dev, + pdata->panel); + if (IS_ERR(pdata->next_bridge)) { + DRM_ERROR("failed to create panel bridge\n"); + ret = PTR_ERR(pdata->next_bridge); + return ret; + } } dev_set_drvdata(&client->dev, pdata); @@ -1351,7 +1366,8 @@ static int ti_sn_bridge_probe(struct i2c_client *client, pdata->bridge.funcs = &ti_sn_bridge_funcs; pdata->bridge.of_node = client->dev.of_node; pdata->bridge.ops = DRM_BRIDGE_OP_EDID; - pdata->bridge.type = DRM_MODE_CONNECTOR_eDP; + pdata->bridge.type = pdata->panel ? DRM_MODE_CONNECTOR_eDP + : DRM_MODE_CONNECTOR_DisplayPort; drm_bridge_add(&pdata->bridge); -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org Cc: Jernej Skrabec <jernej.skrabec@siol.net>, Jonas Karlman <jonas@kwiboo.se>, Neil Armstrong <narmstrong@baylibre.com>, Douglas Anderson <dianders@chromium.org>, Stephen Boyd <swboyd@chromium.org>, linux-renesas-soc@vger.kernel.org, Andrzej Hajda <a.hajda@samsung.com> Subject: [RFC PATCH 10/11] drm/bridge: ti-sn65dsi86: Support DisplayPort (non-eDP) mode Date: Mon, 22 Mar 2021 05:01:27 +0200 [thread overview] Message-ID: <20210322030128.2283-11-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <20210322030128.2283-1-laurent.pinchart+renesas@ideasonboard.com> Despite the SN65DSI86 being an eDP bridge, on some systems its output is routed to a DisplayPort connector. Enable DisplayPort mode when the next component in the display pipeline is not a panel, and disable eDP features in that case. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 32 ++++++++++++++++++++------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index e2527d597ccb..f792227142a7 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -55,6 +55,7 @@ #define SN_LN_ASSIGN_REG 0x59 #define LN_ASSIGN_WIDTH 2 #define SN_ENH_FRAME_REG 0x5A +#define ASSR_CONTROL BIT(0) #define VSTREAM_ENABLE BIT(3) #define LN_POLRS_OFFSET 4 #define LN_POLRS_MASK 0xf0 @@ -86,6 +87,8 @@ #define SN_DATARATE_CONFIG_REG 0x94 #define DP_DATARATE_MASK GENMASK(7, 5) #define DP_DATARATE(x) ((x) << 5) +#define SN_TRAINING_SETTING_REG 0x95 +#define SCRAMBLE_DISABLE BIT(4) #define SN_ML_TX_MODE_REG 0x96 #define ML_TX_MAIN_LINK_OFF 0 #define ML_TX_NORMAL_MODE BIT(0) @@ -723,6 +726,11 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata, int dp_rate_idx, regmap_update_bits(pdata->regmap, SN_DATARATE_CONFIG_REG, DP_DATARATE_MASK, DP_DATARATE(dp_rate_idx)); + /* For DisplayPort, use the standard DP scrambler seed. */ + if (pdata->bridge.type == DRM_MODE_CONNECTOR_DisplayPort) + regmap_update_bits(pdata->regmap, SN_ENH_FRAME_REG, + ASSR_CONTROL, 0); + /* enable DP PLL */ regmap_write(pdata->regmap, SN_PLL_ENABLE_REG, 1); @@ -734,6 +742,11 @@ static int ti_sn_link_training(struct ti_sn_bridge *pdata, int dp_rate_idx, goto exit; } + /* For DisplayPort, disable scrambling mode. */ + if (pdata->bridge.type == DRM_MODE_CONNECTOR_DisplayPort) + regmap_update_bits(pdata->regmap, SN_TRAINING_SETTING_REG, + SCRAMBLE_DISABLE, SCRAMBLE_DISABLE); + /* * We'll try to link train several times. As part of link training * the bridge chip will write DP_SET_POWER_D0 to DP_SET_POWER. If @@ -1288,18 +1301,20 @@ static int ti_sn_bridge_probe(struct i2c_client *client, pdata->dev = &client->dev; ret = drm_of_find_panel_or_bridge(pdata->dev->of_node, 1, 0, - &pdata->panel, NULL); + &pdata->panel, &pdata->next_bridge); if (ret) { DRM_ERROR("could not find any panel node\n"); return ret; } - pdata->next_bridge = devm_drm_panel_bridge_add(pdata->dev, - pdata->panel); - if (IS_ERR(pdata->next_bridge)) { - DRM_ERROR("failed to create panel bridge\n"); - ret = PTR_ERR(pdata->next_bridge); - return ret; + if (!pdata->next_bridge) { + pdata->next_bridge = devm_drm_panel_bridge_add(pdata->dev, + pdata->panel); + if (IS_ERR(pdata->next_bridge)) { + DRM_ERROR("failed to create panel bridge\n"); + ret = PTR_ERR(pdata->next_bridge); + return ret; + } } dev_set_drvdata(&client->dev, pdata); @@ -1351,7 +1366,8 @@ static int ti_sn_bridge_probe(struct i2c_client *client, pdata->bridge.funcs = &ti_sn_bridge_funcs; pdata->bridge.of_node = client->dev.of_node; pdata->bridge.ops = DRM_BRIDGE_OP_EDID; - pdata->bridge.type = DRM_MODE_CONNECTOR_eDP; + pdata->bridge.type = pdata->panel ? DRM_MODE_CONNECTOR_eDP + : DRM_MODE_CONNECTOR_DisplayPort; drm_bridge_add(&pdata->bridge); -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-03-22 3:03 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-22 3:01 [RFC PATCH 00/11] drm/bridge: ti-sn65dsi86: Support DisplayPort mode Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-22 3:01 ` [RFC PATCH 01/11] dt-bindings: drm/bridge: ti-sn65dsi8: Make enable GPIO optional Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-22 10:29 ` Jagan Teki 2021-03-22 10:29 ` Jagan Teki 2021-03-23 7:10 ` Stephen Boyd 2021-03-23 7:10 ` Stephen Boyd 2021-03-23 21:08 ` Doug Anderson 2021-03-23 21:08 ` Doug Anderson 2021-03-27 16:42 ` Rob Herring 2021-03-27 16:42 ` Rob Herring 2021-03-22 3:01 ` [RFC PATCH 02/11] drm/bridge: ti-sn65dsi86: " Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-22 10:29 ` Jagan Teki 2021-03-22 10:29 ` Jagan Teki 2021-03-23 7:10 ` Stephen Boyd 2021-03-23 7:10 ` Stephen Boyd 2021-03-23 21:08 ` Doug Anderson 2021-03-23 21:08 ` Doug Anderson 2021-03-22 3:01 ` [RFC PATCH 03/11] drm/bridge: ti-sn65dsi86: Unregister AUX adapter in remove() Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-23 7:10 ` Stephen Boyd 2021-03-23 7:10 ` Stephen Boyd 2021-03-23 21:08 ` Doug Anderson 2021-03-23 21:08 ` Doug Anderson 2021-03-23 21:41 ` Laurent Pinchart 2021-03-23 21:41 ` Laurent Pinchart 2021-03-23 22:55 ` Doug Anderson 2021-03-23 22:55 ` Doug Anderson 2021-03-23 23:02 ` Laurent Pinchart 2021-03-23 23:02 ` Laurent Pinchart 2021-03-26 0:43 ` Doug Anderson 2021-03-26 0:43 ` Doug Anderson 2021-03-26 1:01 ` Laurent Pinchart 2021-03-26 1:01 ` Laurent Pinchart 2021-03-22 3:01 ` [RFC PATCH 04/11] drm/bridge: ti-sn65dsi86: Use bitmask to store valid rates Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-23 7:11 ` Stephen Boyd 2021-03-23 7:11 ` Stephen Boyd 2021-03-23 21:08 ` Doug Anderson 2021-03-23 21:08 ` Doug Anderson 2021-03-23 21:45 ` Laurent Pinchart 2021-03-23 21:45 ` Laurent Pinchart 2021-03-23 22:45 ` Doug Anderson 2021-03-23 22:45 ` Doug Anderson 2021-03-24 8:47 ` Geert Uytterhoeven 2021-03-24 8:47 ` Geert Uytterhoeven 2021-03-22 3:01 ` [RFC PATCH 05/11] drm/bridge: ti-sn65dsi86: Wrap panel with panel-bridge Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-22 10:19 ` Jagan Teki 2021-03-22 10:19 ` Jagan Teki 2021-03-23 7:14 ` Stephen Boyd 2021-03-23 7:14 ` Stephen Boyd 2021-03-23 21:50 ` Laurent Pinchart 2021-03-23 21:50 ` Laurent Pinchart 2021-03-24 22:44 ` Doug Anderson 2021-03-24 22:44 ` Doug Anderson 2021-03-26 1:06 ` Laurent Pinchart 2021-03-26 1:06 ` Laurent Pinchart 2021-03-22 3:01 ` [RFC PATCH 06/11] drm/bridge: ti-sn65dsi86: Group code in sections Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-23 7:14 ` Stephen Boyd 2021-03-23 7:14 ` Stephen Boyd 2021-03-24 22:44 ` Doug Anderson 2021-03-24 22:44 ` Doug Anderson 2021-03-22 3:01 ` [RFC PATCH 07/11] drm/bridge: ti-sn65dsi86: Split connector creation to a function Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-23 7:15 ` Stephen Boyd 2021-03-23 7:15 ` Stephen Boyd 2021-03-24 22:44 ` Doug Anderson 2021-03-24 22:44 ` Doug Anderson 2021-03-22 3:01 ` [RFC PATCH 08/11] drm/bridge: ti-sn65dsi86: Implement bridge connector operations Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-23 7:15 ` Stephen Boyd 2021-03-23 7:15 ` Stephen Boyd 2021-03-24 22:46 ` Doug Anderson 2021-03-24 22:46 ` Doug Anderson 2021-03-26 1:40 ` Laurent Pinchart 2021-03-26 1:40 ` Laurent Pinchart 2021-03-22 3:01 ` [RFC PATCH 09/11] drm/bridge: ti-sn65dsi86: Make connector creation optional Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart [this message] 2021-03-22 3:01 ` [RFC PATCH 10/11] drm/bridge: ti-sn65dsi86: Support DisplayPort (non-eDP) mode Laurent Pinchart 2021-03-24 22:47 ` Doug Anderson 2021-03-24 22:47 ` Doug Anderson 2021-06-23 13:59 ` Laurent Pinchart 2021-06-23 13:59 ` Laurent Pinchart 2022-02-23 18:04 ` Kieran Bingham 2022-02-23 18:04 ` Kieran Bingham 2022-02-23 18:20 ` Doug Anderson 2022-02-23 18:20 ` Doug Anderson 2022-03-04 15:49 ` Laurent Pinchart 2022-03-04 15:49 ` Laurent Pinchart 2021-03-22 3:01 ` [RFC PATCH 11/11] drm/bridge: ti-sn65dsi86: Support hotplug detection Laurent Pinchart 2021-03-22 3:01 ` Laurent Pinchart 2021-03-23 7:21 ` Stephen Boyd 2021-03-23 7:21 ` Stephen Boyd 2021-03-24 22:47 ` Doug Anderson 2021-03-24 22:47 ` Doug Anderson 2021-06-23 23:25 ` Laurent Pinchart 2021-06-23 23:25 ` Laurent Pinchart 2021-06-23 23:51 ` Doug Anderson 2021-06-23 23:51 ` Doug Anderson 2022-02-23 17:43 ` Kieran Bingham 2022-02-23 17:43 ` Kieran Bingham 2022-02-23 18:25 ` Doug Anderson 2022-02-23 18:25 ` Doug Anderson 2022-03-04 15:45 ` Kieran Bingham 2022-03-04 15:45 ` Kieran Bingham 2022-03-04 16:30 ` Doug Anderson 2022-03-04 16:30 ` Doug Anderson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210322030128.2283-11-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=dianders@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=jernej.skrabec@siol.net \ --cc=jonas@kwiboo.se \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=narmstrong@baylibre.com \ --cc=swboyd@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.