From: Stephen Boyd <swboyd@chromium.org>
To: chrome-platform@lists.linux.dev
Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev,
devicetree@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Pin-yen Lin <treapking@chromium.org>,
Andrzej Hajda <andrzej.hajda@intel.com>,
Benson Leung <bleung@chromium.org>,
Conor Dooley <conor+dt@kernel.org>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@gmail.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
dri-devel@lists.freedesktop.org,
Guenter Roeck <groeck@chromium.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Jonas Karlman <jonas@kwiboo.se>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Lee Jones <lee@kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
Prashant Malani <pmalani@chromium.org>,
Robert Foss <rfoss@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Tzung-Bi Shih <tzungbi@kernel.org>
Subject: [PATCH v2 10/11] platform/chrome: cros_ec_typec: Support DP orientation
Date: Wed, 14 Aug 2024 17:34:15 -0700 [thread overview]
Message-ID: <20240815003417.1175506-11-swboyd@chromium.org> (raw)
In-Reply-To: <20240815003417.1175506-1-swboyd@chromium.org>
Handle orientation for the type-c port when the DT node has the
'orientation' property. The 'orientation' property is present when the
DisplayPort lanes are directly wired to the usb-c-connector and the
board design relies on the DP lanes to be remapped by software. The
property wouldn't be present if, for example, the EC controls a port
mapper part that flips the DP lanes for the port orientation.
Pass the port orientation to drm_dp_typec_bridge_assign_pins() when the
DT property is present so that the previous drm_bridge in the bridge
chain can remap the DP lanes to the right usb-c-connector SuperSpeed
pins for the orientation.
Cc: Prashant Malani <pmalani@chromium.org>
Cc: Benson Leung <bleung@chromium.org>
Cc: Tzung-Bi Shih <tzungbi@kernel.org>
Cc: <chrome-platform@lists.linux.dev>
Cc: Pin-yen Lin <treapking@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/platform/chrome/cros_ec_typec.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index fa7f7efb9d3f..9b54b3288f5f 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -28,6 +28,7 @@ struct cros_typec_dp_bridge {
struct cros_typec_data *typec_data;
struct drm_dp_typec_bridge_dev *dev;
struct cros_typec_port *active_port;
+ bool orientation;
};
#define DP_PORT_VDO (DP_CONF_SET_PIN_ASSIGN(BIT(DP_PIN_ASSIGN_C) | BIT(DP_PIN_ASSIGN_D)) | \
@@ -449,13 +450,15 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec)
struct device *dev = typec->dev;
struct cros_typec_dp_bridge *dp_bridge;
struct fwnode_handle *ep __free(fwnode_handle);
+ struct fwnode_handle *devnode;
struct drm_dp_typec_bridge_dev *dp_dev;
int num_lanes;
struct drm_dp_typec_bridge_desc desc = {
.of_node = dev->of_node,
};
- ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), 0, 0, 0);
+ devnode = dev_fwnode(dev);
+ ep = fwnode_graph_get_endpoint_by_id(devnode, 0, 0, 0);
if (!ep) {
/* There isn't a DP input endpoint. Ignore. */
return 0;
@@ -467,6 +470,8 @@ static int cros_typec_init_dp_bridge(struct cros_typec_data *typec)
typec->dp_bridge = dp_bridge;
dp_bridge->typec_data = typec;
+ dp_bridge->orientation = fwnode_property_read_bool(devnode, "orientation");
+
num_lanes = fwnode_property_count_u32(ep, "data-lanes");
if (num_lanes < 0)
num_lanes = 4;
@@ -582,6 +587,7 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
u32 cable_tbt_vdo;
u32 cable_dp_vdo;
int ret;
+ enum typec_orientation orientation;
bool hpd_asserted = port->mux_flags & USB_PD_MUX_HPD_LVL;
if (typec->pd_ctrl_ver < 2) {
@@ -622,7 +628,13 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
}
if (dp_bridge && dp_bridge->active_port == port) {
- ret = drm_dp_typec_bridge_assign_pins(dp_bridge->dev, dp_data.conf, 0,
+ orientation = TYPEC_ORIENTATION_NORMAL;
+ if (dp_bridge->orientation &&
+ port->mux_flags & USB_PD_MUX_POLARITY_INVERTED)
+ orientation = TYPEC_ORIENTATION_REVERSE;
+
+ ret = drm_dp_typec_bridge_assign_pins(dp_bridge->dev, dp_data.conf,
+ orientation,
port->lane_mapping);
if (ret)
return ret;
--
https://chromeos.dev
next prev parent reply other threads:[~2024-08-15 0:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-15 0:34 [PATCH v2 00/11] platform/chrome: Add DT USB/DP muxing/topology support Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 01/11] drm/atomic-helper: Introduce lane remapping support to bridges Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 02/11] drm/bridge: Verify lane assignment is going to work during atomic_check Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 03/11] drm/bridge: aux-hpd: Support USB Type-C DP altmodes via DRM lane assignment Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 04/11] drm/bridge: dp_typec: Support USB Type-C orientation Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 05/11] drm/bridge: dp_typec: Add "no-hpd" support Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 06/11] drm/bridge: dp_typec: Allow users to hook hpd notify path Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 07/11] dt-bindings: chrome: Add ports to google,cros-ec-typec for DP altmode Stephen Boyd
2024-08-21 16:12 ` Lee Jones
2024-08-15 0:34 ` [PATCH v2 08/11] platform/chrome: cros_ec_typec: Add support for signaling DP HPD via drm_bridge Stephen Boyd
2024-08-15 0:34 ` [PATCH v2 09/11] platform/chrome: cros_ec_typec: Support DP muxing via DRM lane assignment Stephen Boyd
2024-08-15 0:34 ` Stephen Boyd [this message]
2024-08-15 0:34 ` [PATCH v2 11/11] platform/chrome: cros_ec_typec: Handle lack of HPD information Stephen Boyd
2024-08-16 22:12 ` [PATCH v2 00/11] platform/chrome: Add DT USB/DP muxing/topology support Stephen Boyd
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=20240815003417.1175506-11-swboyd@chromium.org \
--to=swboyd@chromium.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=bleung@chromium.org \
--cc=chrome-platform@lists.linux.dev \
--cc=conor+dt@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=groeck@chromium.org \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=patches@lists.linux.dev \
--cc=pmalani@chromium.org \
--cc=rfoss@kernel.org \
--cc=robh+dt@kernel.org \
--cc=treapking@chromium.org \
--cc=tzimmermann@suse.de \
--cc=tzungbi@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox