Hi Sam,
Thank you for the patch.
On Fri, Jul 03, 2020 at 09:24:03PM +0200, Sam Ravnborg wrote:
Prepare the bridge driver for chained operation by adding support for the detect operation.
Signed-off-by: Sam Ravnborg sam@ravnborg.org Cc: Andrzej Hajda a.hajda@samsung.com Cc: Neil Armstrong narmstrong@baylibre.com Cc: Laurent Pinchart Laurent.pinchart@ideasonboard.com Cc: Jonas Karlman jonas@kwiboo.se Cc: Jernej Skrabec jernej.skrabec@siol.net
drivers/gpu/drm/bridge/tc358767.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 08d483664258..85973ae728db 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1353,10 +1353,9 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = { .get_modes = tc_connector_get_modes, };
-static enum drm_connector_status tc_connector_detect(struct drm_connector *connector,
bool force)+static enum drm_connector_status tc_bridge_detect(struct drm_bridge *bridge) {
- struct tc_data *tc = connector_to_tc(connector);
- struct tc_data *tc = bridge_to_tc(bridge); bool conn; u32 val; int ret;
@@ -1380,6 +1379,14 @@ static enum drm_connector_status tc_connector_detect(struct drm_connector *conne return connector_status_disconnected; }
+static enum drm_connector_status +tc_connector_detect(struct drm_connector *connector, bool force) +{
- struct tc_data *tc = connector_to_tc(connector);
- return tc_bridge_detect(&tc->bridge);
+}
static const struct drm_connector_funcs tc_connector_funcs = { .detect = tc_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, @@ -1444,6 +1451,7 @@ static const struct drm_bridge_funcs tc_bridge_funcs = { .enable = tc_bridge_enable, .disable = tc_bridge_disable, .mode_fixup = tc_bridge_mode_fixup,
- .detect = tc_bridge_detect,
};
static bool tc_readable_reg(struct device *dev, unsigned int reg) @@ -1677,6 +1685,8 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) return ret;
tc->bridge.funcs = &tc_bridge_funcs;
- tc->bridge.ops = DRM_BRIDGE_OP_DETECT;
I think you should set DRM_BRIDGE_OP_DETECT only when tc->hpd_pin is valid. I would also move the if (tc->hpd_pin < 0) case from tc_bridge_detect to +tc_connector_detect.
- tc->bridge.of_node = dev->of_node; drm_bridge_add(&tc->bridge);