From patchwork Mon Feb 20 22:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 59682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1537276wrn; Mon, 20 Feb 2023 14:14:01 -0800 (PST) X-Google-Smtp-Source: AK7set+B9b0vVTgM9xEHn2+hTt20fHzPZnFWKZ9BQBqCj5kgPxclA47Utol2w4fpDfcsGPVDexZB X-Received: by 2002:a17:906:fb14:b0:8d4:1e81:f87e with SMTP id lz20-20020a170906fb1400b008d41e81f87emr3511059ejb.57.1676931241268; Mon, 20 Feb 2023 14:14:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676931241; cv=none; d=google.com; s=arc-20160816; b=HRO4A7OTZJ9udI7HlPRB04dyBVNdMd+Q5ze6tufnGVaJIHwH4/+h5kY9WoiWBKz1IV KzNWYy+QdEHJmP++RMF5NcPBKOzWbBPby//TJr9vfeQN6EA0AErlogoARhr1KUwCLFlp 3lgKJ6BAxO9HzFJ1p0s56C5W4yEKVnai4Vkb0O05ii+i0vNJkYQUZYQEHNJFi8pHFan5 5VDWkzakJShGkYRLemkrh9tL3aCBmL3JEk/0Po9eoaWluUqGhHELbx10WvxIcOh3tCXQ 3A9RFtkNRVro9ikA7QQaP+zsYeKm6LNpj5Ew+JUEc8pna+m9/WHY6Rhp4UCkpJXeEEMs Kl2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=p2rA8r1vRndMpn7srMUnFhgGhzOj7xn+WluRQ5bsA4A=; b=tjIC6DkEx380dNTOy7rDCIeQMFnfK0Z2z/TJLtNGkEWWane+hUYgV9lhj2r6SNrpcB cZUp9Af1a5KGU53yj5pgQlpwpLfX8WHRbT5kq0pA6IHZCdLToKxU5imhwrjMqmWI5QZe 3g08jw9dlelhMbwAaAzGUwlz1KUDrey0v6HSjsXgTlKi+EKKk++AotM7CpBJUYQPe5FF GXiQSuLTEBFKP/3KGpXDUton8N0gdWxAEYjWFNEXzB8AQ9RLYMK2x7iwzQ17p0Qk+YJ8 D+uXvuYso8Dgbmmr5CWI8s9LUMBV3ze48C22pvEvUKSZBAXHZD57rNVSIe6plG4eXK2F QnLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=mHzqaury; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=criticallink.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ge5-20020a170907908500b008b2abc981cdsi11253115ejb.507.2023.02.20.14.13.37; Mon, 20 Feb 2023 14:14:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=mHzqaury; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=criticallink.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232608AbjBTWKv (ORCPT + 99 others); Mon, 20 Feb 2023 17:10:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232576AbjBTWKp (ORCPT ); Mon, 20 Feb 2023 17:10:45 -0500 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F93A7ED7 for ; Mon, 20 Feb 2023 14:10:44 -0800 (PST) Received: by mail-qv1-xf36.google.com with SMTP id o3so2311961qvr.1 for ; Mon, 20 Feb 2023 14:10:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=p2rA8r1vRndMpn7srMUnFhgGhzOj7xn+WluRQ5bsA4A=; b=mHzqauryxWqiJhsXX519qgC/XvVGPTToLbjIMDtRBIXlluucPcVrT4NSWn0dTQNRKc ohvzm1+5gQILppRAnJSmmTGiLyJxjIBpPBcRPMUB7+ub7ke4xCwq6Hdd0RapW5loHlyp KeGQf0HaEd6yjcWFIrHXr/iauKC3YI48KJcreUbNA65EPggcExzigbMdo6iB7UpOApm9 F4stavSuo+gKDZuqxygYDuS45PW4o6C5xiRAvFsfIHn7eKlZFDxDGflG0YM+n7ophqVo ZVHMZBiNUeZDXJprspDfQEMbC0QuWyb4f7JbvbA7Qy/OifikI66Ozl17BywWfCsw862m nRSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p2rA8r1vRndMpn7srMUnFhgGhzOj7xn+WluRQ5bsA4A=; b=oVox4KLlKPDoagSivxgY+RHuaFeIHfUysyh8056lJT8u0rz8qC9zI1lwLMSGPNlRME 3ZNPRU6JE4hwp5XMqXXbgpE5RVGLOXb2l8NEYmzAZrDnC6wZAN0O3SOy7JL+CPtcTB79 GsiEWM1QlKpmAvKmh7UVvbbRMyDXo3+mICwIpsZ/BzirYABfcDSNZdrxTqlyUFRYYHOd e54x9EtrPyrjuTLCynAQfUFVwjIAE3wQnDhPu52RJuZOlbuziS1OUzchYxXWcMCDQEbA CwC0Plah4arNDkCO1Ux6bt5IybV6/O4YRNefqfrAqKGbHLpxM6M44UE3B5RqATNzjr4n 0kkQ== X-Gm-Message-State: AO0yUKUa/2ygGjfshbk3TKea7RTqpZbmii1+tdVrDd4bXiLvPL5OkaNz lN317EnqPF1rWB62YDXYkLj1fQ== X-Received: by 2002:ad4:5d65:0:b0:56e:b4e0:1bfc with SMTP id fn5-20020ad45d65000000b0056eb4e01bfcmr6137166qvb.11.1676931042265; Mon, 20 Feb 2023 14:10:42 -0800 (PST) Received: from [127.0.1.1] (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id q13-20020a05620a024d00b006f9ddaaf01esm9766986qkn.102.2023.02.20.14.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 14:10:41 -0800 (PST) From: Jonathan Cormier Date: Mon, 20 Feb 2023 17:10:33 -0500 Subject: [PATCH v3 1/3] drm/bridge: tfp410: Support basic I2C interface MIME-Version: 1.0 Message-Id: <20230125-tfp410_i2c-v3-1-a85d5f0f50f1@criticallink.com> References: <20230125-tfp410_i2c-v3-0-a85d5f0f50f1@criticallink.com> In-Reply-To: <20230125-tfp410_i2c-v3-0-a85d5f0f50f1@criticallink.com> To: Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Williamson , Bob Duke , Jonathan Cormier X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6492; i=jcormier@criticallink.com; h=from:subject:message-id; bh=XWThcU4Z36mFj7a764RgSd+QtYAddWcIDsaMnqm/1io=; b=owEBbQKS/ZANAwAKAdzX/S4LNuuqAcsmYgBj8+/fbtGOndOyo0WswmdkokqdCTIFg5SdE1jlnh1q 6nYAEvSJAjMEAAEKAB0WIQT/MozqCeZtYxNnVN/c1/0uCzbrqgUCY/Pv3wAKCRDc1/0uCzbrqoBYD/ 9OavAPgKYdYrV1zvdJ/h+Ide2dnlgqfZPL18AN//wLzU1BabFk/duIci3N5Zjw8zlQcXbDSP2sptrk ZsQEkdqVLvDyVVfG+gmFIum4K+wyJIqhHFqBL1s5kTSFZCCcviodW9EfKXU7TpOhMjDRg04P+P9DEy 6haeKMJLnoG5y8UlfErBrIeH+sob0zm8fkdPYnSXMJnYGgPx0cgwwuFIyCbLn+Vv1BuDQuaacP1aRo 3TNL2l29HJw22mAX4XeFlqalc0MC7tSrZjYRt8uabgH+Q4BsqrUn6CKiXWKlRCGdeGHPz9biC27erL dI/rZvdHRFsI0gt2I1MH3NgL1kVrs7Ms+mDk+DYK4La/kgdigNzGumKz2SlwaP0ZAZ16xJvIYIf74m kKDhWg9Yeg7ZG1DX67K3+MBZIhodD+dsrki5fX5bUq6rX0K+1EDK7WyuESRK2Ax2cMGObe3J0+eKAn 1zi1SKVTVy+m8d9esDuALiyfpTYOIn3rECCYXrlep7rS4bZ+Z+vbYPqoTUp/OYBj5BdwJGq/RL/+9h wS3iR26RCRR3FEtVVesNx9lEZ2wC+HkRBLwhZKASeo3JkVLK/n+OYgA2UKVsnzeW/7shxXTHT2SQ7Y V0gdTH//bYrHogVDE71KkUHlgp8mzaDqO1Fbwgr4hahSGFrVQ3tWoTTLPxQA== X-Developer-Key: i=jcormier@criticallink.com; a=openpgp; fpr=FF328CEA09E66D63136754DFDCD7FD2E0B36EBAA X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758389853055505655?= X-GMAIL-MSGID: =?utf-8?q?1758389853055505655?= From: Michael Williamson The TFP410 driver does not support I2C. As such, the device remains in Power Down if the I2C is enabled by the bootstrap pins. Add basic support for the I2C interface, and provide support to take the device out of power down when enabled. Also read the bootstrap mode pins via the CTL_1_MODE register when using the I2C bus. Signed-off-by: Michael Williamson Signed-off-by: Jonathan Cormier Reviewed-by: Neil Armstrong --- drivers/gpu/drm/bridge/ti-tfp410.c | 93 +++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index b9635abbad16..bb3f8d0ff207 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -21,6 +22,20 @@ #define HOTPLUG_DEBOUNCE_MS 1100 +#define TFP410_REG_CTL_1_MODE 0x08 +#define TFP410_BIT_PD BIT(0) +#define TFP410_BIT_EDGE BIT(1) +#define TFP410_BIT_BSEL BIT(2) +#define TFP410_BIT_DSEL BIT(3) + +static const struct regmap_config tfp410_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + + .max_register = 0xff, + .cache_type = REGCACHE_NONE, +}; + struct tfp410 { struct drm_bridge bridge; struct drm_connector connector; @@ -33,6 +48,8 @@ struct tfp410 { struct drm_bridge *next_bridge; struct device *dev; + struct i2c_client *i2c; + struct regmap *regmap; }; static inline struct tfp410 * @@ -183,6 +200,9 @@ static void tfp410_enable(struct drm_bridge *bridge) { struct tfp410 *dvi = drm_bridge_to_tfp410(bridge); + if (dvi->i2c) + regmap_set_bits(dvi->regmap, TFP410_REG_CTL_1_MODE, TFP410_BIT_PD); + gpiod_set_value_cansleep(dvi->powerdown, 0); } @@ -190,6 +210,9 @@ static void tfp410_disable(struct drm_bridge *bridge) { struct tfp410 *dvi = drm_bridge_to_tfp410(bridge); + if (dvi->i2c) + regmap_clear_bits(dvi->regmap, TFP410_REG_CTL_1_MODE, TFP410_BIT_PD); + gpiod_set_value_cansleep(dvi->powerdown, 1); } @@ -221,38 +244,48 @@ static const struct drm_bridge_timings tfp410_default_timings = { .hold_time_ps = 1300, }; -static int tfp410_parse_timings(struct tfp410 *dvi, bool i2c) +static int tfp410_parse_timings(struct tfp410 *dvi) { struct drm_bridge_timings *timings = &dvi->timings; struct device_node *ep; u32 pclk_sample = 0; u32 bus_width = 24; u32 deskew = 0; + unsigned int val = 0; + int ret = 0; /* Start with defaults. */ *timings = tfp410_default_timings; - if (i2c) + if (dvi->i2c) { /* - * In I2C mode timings are configured through the I2C interface. - * As the driver doesn't support I2C configuration yet, we just - * go with the defaults (BSEL=1, DSEL=1, DKEN=0, EDGE=1). + * For now, assume settings are latched from pins on reset / power up. + * Should add options to optionally set them out of DT properties. */ - return 0; - - /* - * In non-I2C mode, timings are configured through the BSEL, DSEL, DKEN - * and EDGE pins. They are specified in DT through endpoint properties - * and vendor-specific properties. - */ - ep = of_graph_get_endpoint_by_regs(dvi->dev->of_node, 0, 0); - if (!ep) - return -EINVAL; - - /* Get the sampling edge from the endpoint. */ - of_property_read_u32(ep, "pclk-sample", &pclk_sample); - of_property_read_u32(ep, "bus-width", &bus_width); - of_node_put(ep); + ret = regmap_read(dvi->regmap, TFP410_REG_CTL_1_MODE, &val); + if (ret) { + dev_err(dvi->dev, "Read failed on CTL_1_MODE\n"); + return ret; + } + pclk_sample = (val & TFP410_BIT_EDGE) ? 1 : 0; + bus_width = (val & TFP410_BIT_BSEL) ? 24 : 12; + dev_dbg(dvi->dev, "(0x%02X) : detected %d bus width, %s edge sampling\n", + val, bus_width, pclk_sample ? "positive" : "negative"); + } else { + /* + * In non-I2C mode, timings are configured through the BSEL, DSEL, DKEN + * and EDGE pins. They are specified in DT through endpoint properties + * and vendor-specific properties. + */ + ep = of_graph_get_endpoint_by_regs(dvi->dev->of_node, 0, 0); + if (!ep) + return -EINVAL; + + /* Get the sampling edge from the endpoint. */ + of_property_read_u32(ep, "pclk-sample", &pclk_sample); + of_property_read_u32(ep, "bus-width", &bus_width); + of_node_put(ep); + } timings->input_bus_flags = DRM_BUS_FLAG_DE_HIGH; @@ -291,7 +324,7 @@ static int tfp410_parse_timings(struct tfp410 *dvi, bool i2c) return 0; } -static int tfp410_init(struct device *dev, bool i2c) +static int tfp410_init(struct device *dev, struct i2c_client *i2c) { struct device_node *node; struct tfp410 *dvi; @@ -313,15 +346,24 @@ static int tfp410_init(struct device *dev, bool i2c) dvi->bridge.of_node = dev->of_node; dvi->bridge.timings = &dvi->timings; dvi->bridge.type = DRM_MODE_CONNECTOR_DVID; + dvi->i2c = i2c; + + if (i2c) { + dvi->regmap = devm_regmap_init_i2c(i2c, &tfp410_regmap_config); + if (IS_ERR(dvi->regmap)) + return PTR_ERR(dvi->regmap); + } - ret = tfp410_parse_timings(dvi, i2c); + ret = tfp410_parse_timings(dvi); if (ret) return ret; /* Get the next bridge, connected to port@1. */ node = of_graph_get_remote_node(dev->of_node, 1, -1); - if (!node) + if (!node) { + dev_err(dev, "Could not find remote node\n"); return -ENODEV; + } dvi->next_bridge = of_drm_find_bridge(node); of_node_put(node); @@ -352,7 +394,7 @@ static void tfp410_fini(struct device *dev) static int tfp410_probe(struct platform_device *pdev) { - return tfp410_init(&pdev->dev, false); + return tfp410_init(&pdev->dev, NULL); } static int tfp410_remove(struct platform_device *pdev) @@ -378,7 +420,6 @@ static struct platform_driver tfp410_platform_driver = { }; #if IS_ENABLED(CONFIG_I2C) -/* There is currently no i2c functionality. */ static int tfp410_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -391,7 +432,7 @@ static int tfp410_i2c_probe(struct i2c_client *client, return -ENXIO; } - return tfp410_init(&client->dev, true); + return tfp410_init(&client->dev, client); } static void tfp410_i2c_remove(struct i2c_client *client) From patchwork Mon Feb 20 22:10:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 59681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1537152wrn; Mon, 20 Feb 2023 14:13:41 -0800 (PST) X-Google-Smtp-Source: AK7set8qbNb/1JzNGnkGFsI9+8FzFX+Kp0K1h59ZYu4qPK/YWt1Xsyy/rF7xz/Q+RX3sXy5kwNxj X-Received: by 2002:a17:906:7950:b0:87b:f7dd:792f with SMTP id l16-20020a170906795000b0087bf7dd792fmr19752058ejo.8.1676931221163; Mon, 20 Feb 2023 14:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676931221; cv=none; d=google.com; s=arc-20160816; b=Rsf9UAJzvUGq30aFu89/NfKtdayGLYnXIz/KtC79sirIRrxtPg8wFtBHRpZdCRQMWN goRI8LAEIRl1/uK5t2uTbKO2EIxnOpP6/0rSJYgXIsY81fWRK58fGkwbfelL8aCIbCP+ zyxHyQVYBHImPVe42kj7RE0wn7oqcz9KZZKNtXpVd/n2j6wFVAvoa/UYFxAR1m81nXbI MGbt+MKPm5mavXrOVPp7evJYcMaeQOT543ZjMceyTe5E33UJ1RjRfAEEuVwUwFKcVqNV YxQcgE1JdrFCtCm3DsMiU8aADNxWAYTQocY585zLeOVY1Zvev/JpgbUwdWwUuxtZPVLb oEAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=THHRayynm5AbgmOQpvB3lJW0friOEzmgv0B/wGzZtaA=; b=xkBw0xkFbeqIQG5FS/whdoR+CpvWVxelPFc82sjGikQOqZyEbjHUAJZ9RK28DGdZTL rRI2LBz1xtu4LMddFYDRWU16PF4RaHqYY4SDAzrME0j3Ysi3CkWAbRFG9G666J8y7sqd +IeWuN2ygBC9mC6ZkIGI77qmr9UORIta3Q2MFnA5UmrBJoRL+lnKqkOnwHZpHxa9qaLA iueJq22GPEOY2K2Gwu8o5dBpok2ie+7MQ291xEuTSDRCI+LGIWfIChE5S/CCk5YqwF1A R+KTETKmh2JeyqqUxxyJQ56rfHh84f0wBpegAQ7UjAMxGxICzh/WH1KaJRRvD3iL7aOj 7RxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=cd4XXa3f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=criticallink.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020aa7d0c4000000b004aef6266c6bsi5044075edo.325.2023.02.20.14.13.17; Mon, 20 Feb 2023 14:13:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=cd4XXa3f; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=criticallink.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232589AbjBTWKr (ORCPT + 99 others); Mon, 20 Feb 2023 17:10:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232570AbjBTWKp (ORCPT ); Mon, 20 Feb 2023 17:10:45 -0500 Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60CF0BBA1 for ; Mon, 20 Feb 2023 14:10:44 -0800 (PST) Received: by mail-qv1-xf31.google.com with SMTP id f1so3526424qvx.13 for ; Mon, 20 Feb 2023 14:10:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=THHRayynm5AbgmOQpvB3lJW0friOEzmgv0B/wGzZtaA=; b=cd4XXa3fNnrg4LJTnbDxcbv3CN5vQu9dFW7K/yevG1ESO+5qoiYifACic1FvzLTahl 70UcW1Q8xLIUxahrwD9L377EfRLCR0pWCU2uAdgU42SY+ar3FPPzQ82ksKDUsmgOfys/ IbntLfDc5qgbr7YeEqCz4BOLKCAOqjoptTEp5cpYWumbWaSYLgUAlx3qC1irSU7kAso1 lfUCy0ei8319yKCts5WXcg3IHl13OvAH87QidFj9QXgrri/5mSp9e7voGdC5tU+DfFhH tSSObiPjVWneoPSyWLHE1OZWO5Wz308RjFowk7hzjgqlzzHyYOXuinnidDaVeDhYL4t9 dvXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=THHRayynm5AbgmOQpvB3lJW0friOEzmgv0B/wGzZtaA=; b=h2KDsRmQ4/H6gAEO91exnO8X6lUjV2YH7nhJ/wUZjVGGK5MHiNx3BJaWXTv9Ze3kAy D6Ka7sjZAji9t0HFXGb0mEcVoTQ538aCNWV9DOPs/fSfcSDa5pXoJP/bKf9PE9CCQn3N xvDIqHQ1+x1sMxL4wlzFlIUQQNhXyk192MssLX5V9v2rzYOIGKg1r2E/OpXze6h82X3y iBP+wCGmClnSXLMq12zpy8SQMkXHDphWlzvF1N6E5JD2QzqkUwIO2rqkRDCw+VX5HfHN LF3zcvCMvJ+yGY3nqQ/tosCJIBhGBmXvzwRg/0WGwIQo/tB5cGCL88PUyAwEgchQCK2u Tk/A== X-Gm-Message-State: AO0yUKU58HrJ1pblMhm3T6xITVt37VuDzAwERNhq39XM4DbOrUn9IRq8 V8wjC1pQ6/risjJMJAZ2vvWfQQ== X-Received: by 2002:a05:6214:400c:b0:570:ee5c:2953 with SMTP id kd12-20020a056214400c00b00570ee5c2953mr5529273qvb.11.1676931043469; Mon, 20 Feb 2023 14:10:43 -0800 (PST) Received: from [127.0.1.1] (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id q13-20020a05620a024d00b006f9ddaaf01esm9766986qkn.102.2023.02.20.14.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 14:10:43 -0800 (PST) From: Jonathan Cormier Date: Mon, 20 Feb 2023 17:10:34 -0500 Subject: [PATCH v3 2/3] drm/bridge: tfp410: Fix logic to configured polled HPD MIME-Version: 1.0 Message-Id: <20230125-tfp410_i2c-v3-2-a85d5f0f50f1@criticallink.com> References: <20230125-tfp410_i2c-v3-0-a85d5f0f50f1@criticallink.com> In-Reply-To: <20230125-tfp410_i2c-v3-0-a85d5f0f50f1@criticallink.com> To: Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Williamson , Bob Duke , Jonathan Cormier X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1011; i=jcormier@criticallink.com; h=from:subject:message-id; bh=mvqilqhA2ozv8fVrZmSQf6YxF7B70T7NT6GdEuGjaz8=; b=owEBbQKS/ZANAwAKAdzX/S4LNuuqAcsmYgBj8+/gQc8xd6ZnX+LNtCrbMa8giQdgnGzf3ueFThk4 LUUWk/CJAjMEAAEKAB0WIQT/MozqCeZtYxNnVN/c1/0uCzbrqgUCY/Pv4AAKCRDc1/0uCzbrqqiKEA CrUHS+hGQ+sFkAozQQYuVP4QYluZf5P9PCTtwe447h+TIRNyzmn2K5oc8gx5VNI4HAWreqeJoAsm8H A+4DbWgt+2ms6pIcgx4qiSrRWYxYjIT47n0HLdrwgZSGtlm94K8B72xhxZjf+3qD0b/xz73/6pgDtH IcfH+CZsGWuXNuxeDWK3S6YoqR5BUB3qrp78nJj/gajYET/ny5SfWja0R//ev6VCVP41cVL8az4LRi P58udsLnAufv/JcNxd24LfVhf6gaDbjYpI62vgzihCgRhL95hrWYW7KYRWkkRaS5BgcvIZiS9eyg6f 8XXkijOqjKykbMnTCPVFm5eTzANa8CHekSHZFpx3mL/coXKb249QMED+ug9Osuwes3Gj8KDRqVKUwj b2MiTbIouWH/5GVDm8BWsqkj/x3LVbeB8pXiKbRkOMP+mlr9s8jNuc0OScUp3f/IRzAYuJbTd/xorf 3ttPy7RS2QM2jYgZuZOzKh3dZ4fNqMo/GXY/T2n2sV6bEfxlYkIufxhoIradqG6nioT6Zn+9ebQ9AU 9UitqfVXvj2toe0IHPVu/Qh4cS+icyCBhJuQG+3RMeDFPrUrR9MCzQylUfXPhGfzuGS68VzwoNLfuq VvV3a/oAwQ86bi+J3vTeE0BGC7m005ilVTDoeNjE0fBX6Ot/DF6nuhyQV7Ag== X-Developer-Key: i=jcormier@criticallink.com; a=openpgp; fpr=FF328CEA09E66D63136754DFDCD7FD2E0B36EBAA X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758389832239626991?= X-GMAIL-MSGID: =?utf-8?q?1758389832239626991?= From: Michael Williamson The logic to configure polling (vs async/irq notification) of hot-plug events was not correct. If the connected bridge requires polling, then inform the upstream bridge we also require polling. Signed-off-by: Michael Williamson Signed-off-by: Jonathan Cormier Reviewed-by: Neil Armstrong --- drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index bb3f8d0ff207..41007d05d584 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -155,7 +155,7 @@ static int tfp410_attach(struct drm_bridge *bridge, return -ENODEV; } - if (dvi->next_bridge->ops & DRM_BRIDGE_OP_DETECT) + if (dvi->next_bridge->ops & DRM_BRIDGE_OP_HPD) dvi->connector.polled = DRM_CONNECTOR_POLL_HPD; else dvi->connector.polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT; From patchwork Mon Feb 20 22:10:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 59683 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1537510wrn; Mon, 20 Feb 2023 14:14:34 -0800 (PST) X-Google-Smtp-Source: AK7set/F6oQ5lob2HpT1QT5hxzln3JSFmfb/OgltWnY+G+mQ3CQPOmBJge9+mgUGeSiwnZ7gSGB+ X-Received: by 2002:a17:907:9620:b0:8ab:a378:5f96 with SMTP id gb32-20020a170907962000b008aba3785f96mr9273491ejc.3.1676931274052; Mon, 20 Feb 2023 14:14:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676931274; cv=none; d=google.com; s=arc-20160816; b=I0tnIBJjxp1t1hN85OftPdzatlIxSFUw7dXWquGXTiJVH9GmTEveBMQTBoyXClhB// KTjeYtz8CpF30LxerjeG0MasM31k4DG8TTHU3NS3C99AhaPiqppC8imthtfrtG+Om6kg HZk0vn1ZZRXSxXOjll2OeL4wPIeoogYU5ZTiz5UWk2rDGEWRTSj4789744sjdALirku7 F1U5IJWojL8IVQIsaTRatshnfpfS5PC2w7Xz4vxAsKGOcizx4mO+8Vh6WqLc3GvJG82/ 1k2lWmDGV/S45m+FsuMctC7Ygf4G8MsKrUpjc3GRw71jwWm5EWioCgkn3s6Pc9FVcQg8 UvWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=7++FPNmCT11inHBtqfYJtM4/xAJgiLCvorUz1cWzIv4=; b=KZOiASRAupFj9tj/cjOi03a197JvSxbvIwxBHjmkNUYYn06kp+ELlJJ25qC5mm3JSd nK6QreuDqxi0CfrVPiOZ1AbnCr9Gj/jkjpuVDiyybb9LO0IJxYS9KgrjfM9CweKHJDEb m06k5BCM527hNUCWBewphhVMMNNq1LLWRAVLlfWw4GtEgH7IcF178GyYlnHePXpR0tHf Sc2C6MMv7x3HLReWslUeEckMc2/P20HLVeNxiBYZhG7aTeSVLCW8revNQcbxlOPpmYSa zMQlzjwadIwUf92RJjw8ztz9sCH3KKd4xolN7/NJpQflMg8PVDqm/MRaLVfIyegFCVRv Sh6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=RLcaWVGF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=criticallink.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p14-20020a170906934e00b008ddf3c18301si578610ejw.653.2023.02.20.14.14.10; Mon, 20 Feb 2023 14:14:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=RLcaWVGF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=criticallink.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232627AbjBTWKy (ORCPT + 99 others); Mon, 20 Feb 2023 17:10:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232584AbjBTWKq (ORCPT ); Mon, 20 Feb 2023 17:10:46 -0500 Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80C54FF3A for ; Mon, 20 Feb 2023 14:10:45 -0800 (PST) Received: by mail-qt1-x832.google.com with SMTP id w42so2945269qtc.2 for ; Mon, 20 Feb 2023 14:10:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7++FPNmCT11inHBtqfYJtM4/xAJgiLCvorUz1cWzIv4=; b=RLcaWVGFtPjStOXJrnuKglAddJFhMNvM6D2JJSDTT8hyU9jFMLqOJGEGk0ajfMoBrM PfC5atL0Ls1yLQ87fd0Ypl49U6ULpfyvMYtGWxUA1GlWMWK21gVi+JabNX4WNqVbRXKV JjEGjOASQTJNQOIjeY8p7eAqAAcdpIIWy6vb0Q7JFSEbN6dJPj+/tD0zvEPKzjtj0sWo hutyy7WBOYuXXo15XyY02NyWItQh+mM7JM7/d31A9LIx5r7kMeY6TlxfJ4oeaE3KxP5u P4GLYRCM8pR/f72Z2jhuAHQriYKsDM6fF+U8A18Rtp+SFLeBwfphtZT1nvPOQiPRWCiS UNIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7++FPNmCT11inHBtqfYJtM4/xAJgiLCvorUz1cWzIv4=; b=XB84QQwDw6DjI1uHQ6sh47wqrzCkugwSQ9jm7DQHGu09blcvkzIkJhF59W3EeHMI1x 7WBMMF/D93PNLrv7GpH8kfmjjLJWLOXw35k9DVcVej0yVSjP8pMuRibX+RO30pQjg6+o xhsWD6JnBEtW6rUHK7FSBGEuH3RYX+os6FL1o21qzQslo39uVlI7CUKcVoxf2sNSAdoY Kx13ttYKL2O1DvriXSlbDO33jSdv4IGVmSzTDmAYKVKrGjnVM1/xOzZbAFOKjDfVovug 2JnRPVkFChjBeVAp7zkHiS0Fpg8vOwk2fo40EJESJ8SSY5etmZISDOOzJEe4aED6MP4h Cstg== X-Gm-Message-State: AO0yUKVaJEtYkaI+DHOTmZtU+FBMFSGPBVA9C+97pNsW/H1GQPOctpRU L8FU34nwadN8pi2myoy2JCmfSg== X-Received: by 2002:a05:622a:44f:b0:3ba:13dd:f253 with SMTP id o15-20020a05622a044f00b003ba13ddf253mr3677795qtx.7.1676931044624; Mon, 20 Feb 2023 14:10:44 -0800 (PST) Received: from [127.0.1.1] (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id q13-20020a05620a024d00b006f9ddaaf01esm9766986qkn.102.2023.02.20.14.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 14:10:44 -0800 (PST) From: Jonathan Cormier Date: Mon, 20 Feb 2023 17:10:35 -0500 Subject: [PATCH v3 3/3] drm/bridge: tfp410: If connected, use I2C for polled HPD status. MIME-Version: 1.0 Message-Id: <20230125-tfp410_i2c-v3-3-a85d5f0f50f1@criticallink.com> References: <20230125-tfp410_i2c-v3-0-a85d5f0f50f1@criticallink.com> In-Reply-To: <20230125-tfp410_i2c-v3-0-a85d5f0f50f1@criticallink.com> To: Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Williamson , Bob Duke , Jonathan Cormier X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1511; i=jcormier@criticallink.com; h=from:subject:message-id; bh=mnMRLzTQ5OvUKpoF4H4mdtxVS/UwcOVTBoA/DdsbVck=; b=owEBbQKS/ZANAwAKAdzX/S4LNuuqAcsmYgBj8+/gbxbQIXcBj3r2SwiKKjNAonNiEYXuvWSNoLKp yrmAJ+KJAjMEAAEKAB0WIQT/MozqCeZtYxNnVN/c1/0uCzbrqgUCY/Pv4AAKCRDc1/0uCzbrqvBoD/ 4yR8Qxx7wDUg3SL3m4/8rA1G+JdIXlFJz5dcG8z5fkFfu0tsqWok3HvJqF0cWOzUbu9RZ8J2kys+xy zgUQisH1V64vHDi5YyytNoXTNRPEa+oJfpykZQt/0NFC5WtkKQC+RNxEXrG9vaO7uzLRnVCZbaCPLb 3QYld7UNCpbHgBqcY2AqJkWJzJNcx/piAG+3Z6vh40syyMfRJmWOuFh10H9+6OYicaGK9XJ7eDI08/ b6TRdpK0tMVULOhyua13no6DqO7njXz25b1d0dzUYgPZpWf2ryrolcyZoAs/jFlm6pNBsIs54Nv+kA 9N3AO6ahzlQ9VV+YebIyXiPT8DezpZ9lz/4QUOks1HHaMkXgUQHgB8ukQKErmChbSV/KlfVVRHy8ih ZDOXoMSE1S/9JMEyDFKZSynNCKZr+chwoLOlB0l86ewB0sL5YONu2Mz2qm7xhBNNxIAKmAzjBdTpqt BOw0EMZy+mJNG5ffljDHO8gkLZI6vUtkIObWqEs9ObQWJtHkakatQJQhkqUCyODFuXNcAgzGqy9FRY gNBqVt3HbTySwXkgYtQlOQh9cOB/k3yWv+0Txom0TH+CMr0QcVHJUQpkvPGLw8xYigWyMQqz4jRX94 vpDrBxgXVUoty24lmoQOLE/xRGryb0EO/zP52tX39J2Pma+DAHqTEntUkn4w== X-Developer-Key: i=jcormier@criticallink.com; a=openpgp; fpr=FF328CEA09E66D63136754DFDCD7FD2E0B36EBAA X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758389887470331670?= X-GMAIL-MSGID: =?utf-8?q?1758389887470331670?= From: Michael Williamson If the I2C bus is connected on the TFP410, then use the register status bit to determine connection state. This is needed, in particular, for polling the state when the Hot Plug detect is not connected to a controlling CPU via GPIO/IRQ lane. Signed-off-by: Michael Williamson Signed-off-by: Jonathan Cormier Reviewed-by: Neil Armstrong --- drivers/gpu/drm/bridge/ti-tfp410.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index 41007d05d584..eeb7202452aa 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -28,6 +28,9 @@ #define TFP410_BIT_BSEL BIT(2) #define TFP410_BIT_DSEL BIT(3) +#define TFP410_REG_CTL_2_MODE 0x09 +#define TFP410_BIT_HTPLG BIT(1) + static const struct regmap_config tfp410_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -105,6 +108,15 @@ static enum drm_connector_status tfp410_connector_detect(struct drm_connector *connector, bool force) { struct tfp410 *dvi = drm_connector_to_tfp410(connector); + int ret; + + if (dvi->i2c) { + ret = regmap_test_bits(dvi->regmap, TFP410_REG_CTL_2_MODE, TFP410_BIT_HTPLG); + if (ret < 0) + dev_err(dvi->dev, "%s failed to read HTPLG bit : %d\n", __func__, ret); + else + return ret ? connector_status_connected : connector_status_disconnected; + } return drm_bridge_detect(dvi->next_bridge); }