From patchwork Tue Apr 4 16:26:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 79236 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp19755vqo; Tue, 4 Apr 2023 09:47:14 -0700 (PDT) X-Google-Smtp-Source: AKy350aocdqtARyPsc36QP2K+j9FD758VbirO+6vbRQ2TaaRx2jS+CFKJIcHfLb3GWjZHBOcfRXS X-Received: by 2002:a17:902:d4cd:b0:1a1:ce05:9ba with SMTP id o13-20020a170902d4cd00b001a1ce0509bamr3896114plg.52.1680626834205; Tue, 04 Apr 2023 09:47:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680626834; cv=none; d=google.com; s=arc-20160816; b=Ju3biiaTBWmd3LW3/Dg/YfhekdEZ+7BFHdgG3Z0Jnj++ITSEjXU5lcBp69Ow9lMzHJ pGRMwp5cUAaxDHr52bZqlKgcxZpaJEgl6ZZMB7IoMi8svTE9na+5jOeq/n492O2fG/TQ sOQpYs+Mf09t0UqAGfzBUkmifA5HpoznWhfioH7nGKjIXVMaHgRs3E07joalDeSx5pxr s5VuOXGU4FoYTcSRsN1wCn7FtKWkc/45JNnKKpgJf9UnM5W4ByeV0/LpO7iuyzK9KBM9 5rIY5xGmZoXBEkYs1DefxGHDYJRIsyO0+t1FJkTU91nWOZQl+aunbs4DoEAEgUnd4EAI 0gdQ== 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=S11u5DTA9h019l0IrQX+AN9OVNLb/rYYX+LKhYQ8rHU=; b=as8Yz57MqOexQ9Av0FchDuiqcE4sgQYmYLtMBm/Jl3KjoggL6bWi5TeV5MAcauHxB4 259zhumgCWS7C3MaZFMvl12RcBS7Jy9hhZKgqzFCVVWrsSiv6MEeEM0BBb+/xzPsPIK9 vy6Fyg0WiG2F+ZAdoXxm478ZJQMaaQHgAdgRUfEq3eNT+RVMa0YXXi2+Jsi9JpLYjJoo ynYcOUBc0QFx78m8vesZBxSpsKYzmgFbGRjuk/LCMEqB1g9FzI1tG1VssfljZZ2CGh1C 0LgWA0hvZHRfkUp7lTfEtb+HpNU77kazeBNOLYnZ6oEREeLXucPs3Q0gvSbkRYndMhtu fXCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=RASK7vLM; 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 j7-20020a170903024700b0019f3d800abdsi119026plh.82.2023.04.04.09.46.47; Tue, 04 Apr 2023 09:47:14 -0700 (PDT) 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=RASK7vLM; 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 S235445AbjDDQ1S (ORCPT + 99 others); Tue, 4 Apr 2023 12:27:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235382AbjDDQ1O (ORCPT ); Tue, 4 Apr 2023 12:27:14 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB05440E6 for ; Tue, 4 Apr 2023 09:27:12 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id y4so2038222qti.5 for ; Tue, 04 Apr 2023 09:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; t=1680625632; 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=S11u5DTA9h019l0IrQX+AN9OVNLb/rYYX+LKhYQ8rHU=; b=RASK7vLMEox4wcrZx3WZ1lA9nJRdmq6+T1OSO7Vhf7DudPiE7VgGm2Tm1HvCrAkkqa llLuE3qdsEVHFfqrLAnYFSV7D9M2DeQ7+JybpsxxpOGfWNY9q7xDVsn0MgykC4jH+HBI BLrsWNgnPsWdfx5hKtAThkfL78drNr9HaC0s6AfqIHP7RJKp7VsLKtNwccbCZE3HxkWf nhAfsaI0qt0LEU7ZCnn7aASy/VozpUv8O/0OmpHi8uLJSK8b/nPNTkNUyhMCnRn+grNS gyKG/OEWOj/aXu2JMkCmhUQwO9+KEMsLigfCQ0VmVi7F2vZi3eVNK34GHJxA+/3oupZT TaPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680625632; 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=S11u5DTA9h019l0IrQX+AN9OVNLb/rYYX+LKhYQ8rHU=; b=bePhfyqvyzZOnD9wcjk63RY7ZbgRPHGvXIFlkU8nqb0EZHFoOM0EbjZj2o6G6U6dGP UURIyME63r40oHv6794EjGUUK1cQblrDab7QCfii+IuDxGcefxZujZ/h4Lj3vazRUVLD vlKVG/NxKCbPu57RUWg6G5pE4odtDJAhV37rHwedDdMHhOg14SBRTXFt+KV3GaLaVWcy 4lp5Rqz2HsI3TLaNaKYT+Vx4oEX6WdwahFhkk83Btkq8rysDD21odnzy3x3ycedOCqER oEnaMz22wbpr+0LRpi9nQfBv2c7AHrjzCBPx98gsMikF+qum1/opydSh8ZwaxS161a/h dahg== X-Gm-Message-State: AAQBX9cndwT9e51kqkaCxF4vFO9tkAzgrcYUGX1MGvICMkOCAQ+WQStm 60IXgSnrHqE4yrBpuzAJs1SgWA== X-Received: by 2002:ac8:7fd5:0:b0:3e6:3929:e9ba with SMTP id b21-20020ac87fd5000000b003e63929e9bamr4362000qtk.66.1680625631766; Tue, 04 Apr 2023 09:27:11 -0700 (PDT) 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 m124-20020a375882000000b0073b8745fd39sm3699594qkb.110.2023.04.04.09.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 09:27:09 -0700 (PDT) From: Jonathan Cormier Date: Tue, 04 Apr 2023 12:26:48 -0400 Subject: [PATCH v4 1/3] drm/bridge: tfp410: Support basic I2C interface MIME-Version: 1.0 Message-Id: <20230125-tfp410_i2c-v4-1-f983bcef2df8@criticallink.com> References: <20230125-tfp410_i2c-v4-0-f983bcef2df8@criticallink.com> In-Reply-To: <20230125-tfp410_i2c-v4-0-f983bcef2df8@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=6549; i=jcormier@criticallink.com; h=from:subject:message-id; bh=21jXZ+7XjoAljy4+OPvocGx/SSsnd1AKvRiNCdogF0A=; b=owEBbQKS/ZANAwAKAdzX/S4LNuuqAcsmYgBkLE/YFOKfMh9uwiFGyBNIIlSBVft4zR400ef4C0pF I+hykreJAjMEAAEKAB0WIQT/MozqCeZtYxNnVN/c1/0uCzbrqgUCZCxP2AAKCRDc1/0uCzbrqqU5EA CAnTpvqp0nQNk60kh6QCPyzN2jqhlAAV/WBwd8awLa/p++tjdMpwZIUZq93gwe1TlYws64v2Cp0T2n ruuQugpUea1Ln+Df1rPys/YhMWnURAblLw9BATgxu+1oO8R+NisIOvlUA3NtiK8o2RM4x2Ai1D3qxA PfcPbwaWTZ4b/zrKGpfn9PTnxV8k6PGM8oLMvSZ4fOrDGJsi5BSEm9kkS+zZtCvxs4O+sGAPPNRNe6 56Le4k5D5f8U/Dx7rzG5KHpdARVABivIfQafNlVCDaeiQvc1isH/nZq9HEWH9oZpfvsUEC7pnOhbwv iKxISytMHft3XXDQxmKcfVIcDMxTkvqvuscFz88DGJ4kqwuDZDXlx4nHsQakB/Dr4Yw2gZE9uCJ8Wk Raph0G3xn01pe+EjvWmt8eM69TbQ6fHjIAJ1chqcWxMm2i2UrjeyIQkrpNB+KBVLcDHl/IOT+p0cR7 rrKgGaN0k+xDA7UtDl6Z3C99KqB+Whskxtdty8JwxKn2w4OxWYQMq1ieFGWhWaDONvr0sF7aHwqM01 st0i6ON3U6Md69Zh5bJWjVHV/8wKu97B2Os6X7BWrLRgtI72bRMlvzyCwZLtc1Xl5cpgnUyPdzL9n3 AdyMjXehj9EZs6ypXPVRfigvR5utZUtiXwusm8m9nOk7B/hbPQ1V9QU8N64g== X-Developer-Key: i=jcormier@criticallink.com; a=openpgp; fpr=FF328CEA09E66D63136754DFDCD7FD2E0B36EBAA X-Spam-Status: No, score=-0.2 required=5.0 tests=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?1762264963109322714?= X-GMAIL-MSGID: =?utf-8?q?1762264963109322714?= 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 Reviewed-by: Neil Armstrong Signed-off-by: Jonathan Cormier --- 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 Tue Apr 4 16:26:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 79233 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp10600vqo; Tue, 4 Apr 2023 09:33:27 -0700 (PDT) X-Google-Smtp-Source: AKy350aXVB+4wPHa9VaUbkE8FVU/NH9D9Gz5MeLgdPMvmPU1yK3x7w54CrMMyunkM/2r/I3RtJvs X-Received: by 2002:a17:906:c2c6:b0:931:95a1:a05a with SMTP id ch6-20020a170906c2c600b0093195a1a05amr118769ejb.62.1680626007315; Tue, 04 Apr 2023 09:33:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680626007; cv=none; d=google.com; s=arc-20160816; b=g+ELQAbn1R7pkYKl94G7c+OWtQA4ZNBhVS1wOBfUZlAwA8fetOe8f67z7u9ztICfBg bJHkrSQgKGxlsHukQ8NFHVvDRWlN2gQMgetdaKWoVJY4ADizZVhHj7Ft7PxG9KER76q8 CVKfua/BOiZHvZ3k9DBAhC8uY5hroGx4n0J8yCHVU2w4ADwEf3H//ldCzNOuuHmmayCH zby4gWSPC5cu90SxY4Xf9/4oqshBadOFsfl8U1ru0HFOs5VkhyNpcZAv6Y3Q8DvlgguG ABrh0b5zMT0w4Vr79YxjTiKAdNGiW93lU0YAp69YxkX80LdVFsLM0O4YQAhbmsPXdzDJ FVYQ== 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=JhwrIjGdHvbP7iRYz+GF4I68rmmYmSv00IVMxjU1xN8=; b=DIq0dHLWCuK2QjxL4KZC2NFt+S8d5q7ip7j5vRnK+fPU4jjhqNVsRnVJFolNP5WBKG s30w6/um2wkRsBGJwQdIVpFb0c/9Iwg3+utkIcK6xkSPfhLptw1wnbA3fbFjPqQuxMEs oeJM2qGBbcxebiGlrMZZbQUvyMW9hcQuIy+guUnCpySs5CxZ1paLwaU7tenPWAYvA85g kZ4G9Ro+Geu26tCkhMqQwSLhWLfX/lSIt/cwA6Z6URAUW/DjIqEyrGDFnzcp0D/Zz2W7 LYsRSSqpA6G1XbJsnPPCIrGNS15ziyLyA7QEh/oCd0MuC6aXCDgCYdDXF2B7JhmiwA+0 2zDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=ZtCNBHqK; 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 a15-20020a1709063a4f00b00932f1463036si298202ejf.283.2023.04.04.09.33.03; Tue, 04 Apr 2023 09:33:27 -0700 (PDT) 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=ZtCNBHqK; 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 S235705AbjDDQ12 (ORCPT + 99 others); Tue, 4 Apr 2023 12:27:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235521AbjDDQ10 (ORCPT ); Tue, 4 Apr 2023 12:27:26 -0400 Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E3F049FE for ; Tue, 4 Apr 2023 09:27:19 -0700 (PDT) Received: by mail-qt1-x834.google.com with SMTP id r5so32092089qtp.4 for ; Tue, 04 Apr 2023 09:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; t=1680625638; 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=JhwrIjGdHvbP7iRYz+GF4I68rmmYmSv00IVMxjU1xN8=; b=ZtCNBHqKs8v2GxHBkp3iZsN1/Aj4WowcQaeTkud3ULyCdCXRN3419nTF4lYEw7JCVm lINN0tC7Q3eUE2If0tAq2MSpjL3+GB+oggPts/3PIm9kmHzBQEU9c7kqq3FhS+KRW7Pj g2zyaBRKwGVb22cEq8jh1O0D4XyxUuP42v+0HT5FeQ5Gi/67Rx5mNT0rEesrbN1OoTtw 4LWx2qQ8AJ+0p7cbYKm+9+AhMpibKe3nsn4MBkTLdnmS88PGkjgLw7rSDd51LadmyAW6 8J+ZXzFFxtlb4xt8nqoqw1+dV6pjLDjwGxbjGFJCDQLBjEOH+X3KeHS+rJbfRog0UUSX si+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680625638; 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=JhwrIjGdHvbP7iRYz+GF4I68rmmYmSv00IVMxjU1xN8=; b=X9WYnUvLXc9ioYhRTz0++CxneF+9GfxWPs/7GhdcaQAQZlIsOayW4RrMfqAh9nc2fV s51zDPQfOJIUpuwQ8+ZiT0SEygbxs3Vq6KkUTRgk98bB0U1TCIp3LKF/fKi8EFoVBSjh iyJMR2TtAa2RsxVRBKEuiNEns0+AgvibiJxLT758XUFYYf8gnpC6FXKVKNHxWlShXjed 58suN6q2CRkSky0tL3u0/j+mRHR/1XSHBQ+CdQjlknbrlJN5p3r6Ikx6VD9r/jVvQ8p1 51POiJgY8ZjpYrJ16zbKuRW2IlYxYJxBE5pjDvixMK1T1LJygGiaW3JXogvBs+ZcgOXM 1yAA== X-Gm-Message-State: AAQBX9daD/dDZWAPPOuy89JsvoU+Q4yPScpAvlaaA743sVXpiL+ftHJt bULKiladcdXQXWFTca6iUkkVCQ== X-Received: by 2002:ac8:57c3:0:b0:3e3:86d0:4ef8 with SMTP id w3-20020ac857c3000000b003e386d04ef8mr37879614qta.28.1680625638589; Tue, 04 Apr 2023 09:27:18 -0700 (PDT) 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 m124-20020a375882000000b0073b8745fd39sm3699594qkb.110.2023.04.04.09.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 09:27:12 -0700 (PDT) From: Jonathan Cormier Date: Tue, 04 Apr 2023 12:26:49 -0400 Subject: [PATCH v4 2/3] drm/bridge: tfp410: Fix logic to configured polled HPD MIME-Version: 1.0 Message-Id: <20230125-tfp410_i2c-v4-2-f983bcef2df8@criticallink.com> References: <20230125-tfp410_i2c-v4-0-f983bcef2df8@criticallink.com> In-Reply-To: <20230125-tfp410_i2c-v4-0-f983bcef2df8@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=1161; i=jcormier@criticallink.com; h=from:subject:message-id; bh=thTBke4adSbjQB+Az7ku6gTKJI14U3xmvadZhGFOYMw=; b=owEBbQKS/ZANAwAKAdzX/S4LNuuqAcsmYgBkLE/YIu6HYilZxFWf+fAQXGrPc3NZJOHfU8IajFHX +WG0356JAjMEAAEKAB0WIQT/MozqCeZtYxNnVN/c1/0uCzbrqgUCZCxP2AAKCRDc1/0uCzbrqtx8D/ 9eYQrGQHYfDwF38dKrsTbYYGWQkO9RbvLizz2zK6sPjERuElcIyHb1tc87UgrdMz6oVwFvAf9gPSol mWEUPGff0hIoNlzeZtDvh+c33wxgQXejInX2eBcPryiU6jOsiQBbutNh9EKRBGa4vDDrxq/UfUiItn dHTY0jqxh+gSfWV7bWg0wMankS65kJtnm/wcNit00TMdbrYzjhmNnV9aLsZs2cXRG8InRC7w3db/Hc pwi7YQ2/AHR6YKnqvhOM7KTqWb9v2orkiFN6q9zZhaeEwWWgl0tBOR/OfGbdPfkE2uxbVdrAvWyc5Q aqd02xIaWKKqxIF2DJx4akESDUex5zzNb0w3wL5+PPenTYcbaHs1tMfvsO7Cgt+Bm5GDstY3BYtT+j ij8oaqxmJkK8++3tHCexC/uayQi7sExzN/5P7shgKGbIoi23AkiKjNw7tZ65lA6Vrh+nSNPMMbWVZb 34datHiI6xJ+spdB0tCALG/SD1s5ImkUXEozuXbh3d2pdZAo/0SOXfr4rYZxP0b1pWG1mUScY+5vcU Jm8dWe7KOOxB5DHu0GyzWskm69pu+ZPwUNDdCiYpgU2tBvTtvu4UIy0dwGcOenxLksEnFvjyET1yNV tfsUEG65wcUY0k1RqNwXJ7yJd6lOEoS9OBb14yEkjxebzUiOGI0Hgo275XOA== X-Developer-Key: i=jcormier@criticallink.com; a=openpgp; fpr=FF328CEA09E66D63136754DFDCD7FD2E0B36EBAA X-Spam-Status: No, score=-0.2 required=5.0 tests=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?1762264096210596474?= X-GMAIL-MSGID: =?utf-8?q?1762264096210596474?= 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. Fixes: 5cafa0f1853b ("drm/bridge: tfp410: Replace manual connector handling with bridge") Signed-off-by: Michael Williamson Reviewed-by: Neil Armstrong Signed-off-by: Jonathan Cormier --- 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 Tue Apr 4 16:26:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 79244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp21996vqo; Tue, 4 Apr 2023 09:51:19 -0700 (PDT) X-Google-Smtp-Source: AKy350bdzJR+pbMZ7AH6Iy9ZVF8UBAfpnkg8LoAay5I3lY4SAVwYSScoiskEvMRH05jhQMn5gz1B X-Received: by 2002:a17:90b:2246:b0:234:384f:79c with SMTP id hk6-20020a17090b224600b00234384f079cmr3672335pjb.33.1680627079436; Tue, 04 Apr 2023 09:51:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680627079; cv=none; d=google.com; s=arc-20160816; b=KQCnMGC2lekYwPGBNkocv4mEcRCwIwVoJLIYiWpbGFCtx168TeHV7DPub78eEVsm4+ K612df7LCyev9EYZOowMKrMYUoG+cUvgVndrIMA+YjwdA86hxudhWNBVNpaK86RC8i6v qM+SaSBgzFj8qPN/PyvDPg2abK+rB0Sgqm2qM2q/R2V36FDLP6JK3/2GnhuWp5xHXGYz HWuMP02vX4PgnigMEWKdlZC+/CMwbWhfuUrJYPz4HG+KWsVfSIsWP6WftYsENfk4qD58 ZaJlGn3Xi4fBATGleb4hwX9YM1gwyA0k/OKZlkPYKZhjn3bEB4zu+UI0egGxNFppnipy I/SQ== 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=uCKZ9Mkz+RQ4mEYeEtL01DQSakeCQYik5lgGNcrvFgw=; b=P3kVSIFujOyAyp/zuiMnHbp+Uj+S7NvrEBKc/PyRw4C2pYKyINJn4HYSXPngmhIbpV DmLY5REHyuk9LbtAnjxxHiE06/FFLboz92OKhRBqtHaCRmdGCj8fPtjjFhXZkJ06ledD wtwB4SErbRTk7sx31tOOS0tkvp6THwrcH8a/1xADi6+Phrbq6lEVjUf8njXpOHjqoT5o 6tv3PsXo7I/+SyHHYXNi5fj9PaqI9J3isx1oosVaWZ5TlNLlfxgL6L6CNRu++BdqPKrd Gft7tPV1TJAgId+YMmmKxUDXSGR81X5qvpvIAPWK81g6j7GYEGIMtz0/HRmOMEm4ddjV 1SrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@criticallink.com header.s=google header.b=gu8aDzW6; 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 i8-20020a17090aee8800b00233f394d0e8si12699648pjz.53.2023.04.04.09.50.48; Tue, 04 Apr 2023 09:51:19 -0700 (PDT) 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=gu8aDzW6; 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 S235861AbjDDQ1d (ORCPT + 99 others); Tue, 4 Apr 2023 12:27:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235684AbjDDQ11 (ORCPT ); Tue, 4 Apr 2023 12:27:27 -0400 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 CF5D34EE5 for ; Tue, 4 Apr 2023 09:27:22 -0700 (PDT) Received: by mail-qt1-x832.google.com with SMTP id s12so28473565qtx.11 for ; Tue, 04 Apr 2023 09:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; t=1680625641; 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=uCKZ9Mkz+RQ4mEYeEtL01DQSakeCQYik5lgGNcrvFgw=; b=gu8aDzW6mk7ndqQJ78eCYXkaMIcBflx9g1fcE0d0FuijriRXhfnU+AnBoaG8G96Ao6 4woLHIqo1G0iduPIi1uA2GwJUvshAoPxVcs43wl8YPmvnvOMrw9WXwIll1kpfbn9q7+N jSoBV/aRYVQ0vC3xsX1DKaagUy1y2NKXB8C12FbSAU7wirgtLPywwAAI6K0ExR/IMoCY br0DhHh7k1Jv2pbZMvlFHFMJlYYPmp49p1HAccZo6HoawFbG20Zq4chO9gJdRf9iTatF 5OEwjfIZQ+l1iV76f4Dm/7LHQUAqQyXT9fmfTXxajhx8Gkq2P9TcaFiMJC5czUuyJu0i yZSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680625641; 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=uCKZ9Mkz+RQ4mEYeEtL01DQSakeCQYik5lgGNcrvFgw=; b=11HwIkIpICmBcXRB/J/EOosgL5wMpG0QFZ4g9OuYoOX85y3Q5/TIpKMHkYGrK5rE/V zkJwP2wdAU3EvGYTBgXPwe7Up1O63+s3l/6c1YuQGKCP34pl5sTdLadTzKzWrmCDwKI6 F0JXzy+Y1blwxjj0p8CzeP5IEQx3a5rKT3/guPb6YZv90BOjVpZ7IRSEtbkqAiJlEgJB 0N7UDduhYKCS6R5OtZOmGHfOE8Wbwe1K0MdDkvRDjSouIJtlaHdLCWwRHUEzXY9Hvsr+ LxB3T0dYshO52c8nVF9nXXj1dKTz+e+NHlbzDhq12V7sjWcLcoDAWngiZc+iWS7NhlsC waTQ== X-Gm-Message-State: AAQBX9cKo5qe9t+zFf66iDreunZLeosCCYHfti88j/z6vURrYwP1iMKV /sE7SoPc3slz5XqifpBcaehIlA== X-Received: by 2002:ac8:5716:0:b0:3e6:38cf:fc93 with SMTP id 22-20020ac85716000000b003e638cffc93mr92844qtw.19.1680625641325; Tue, 04 Apr 2023 09:27:21 -0700 (PDT) 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 m124-20020a375882000000b0073b8745fd39sm3699594qkb.110.2023.04.04.09.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 09:27:19 -0700 (PDT) From: Jonathan Cormier Date: Tue, 04 Apr 2023 12:26:50 -0400 Subject: [PATCH v4 3/3] drm/bridge: tfp410: If connected, use I2C for polled HPD status. MIME-Version: 1.0 Message-Id: <20230125-tfp410_i2c-v4-3-f983bcef2df8@criticallink.com> References: <20230125-tfp410_i2c-v4-0-f983bcef2df8@criticallink.com> In-Reply-To: <20230125-tfp410_i2c-v4-0-f983bcef2df8@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=1568; i=jcormier@criticallink.com; h=from:subject:message-id; bh=e9amVn7Rg4sZ0MMr3Oo/rypthm9YpAHvIkIP258W2H4=; b=owEBbQKS/ZANAwAKAdzX/S4LNuuqAcsmYgBkLE/Ys8NZkx1nbBAzJJRYhysKfHgmOTynPZlQqnaK +xQYoxuJAjMEAAEKAB0WIQT/MozqCeZtYxNnVN/c1/0uCzbrqgUCZCxP2AAKCRDc1/0uCzbrqriqD/ 4utNSdB0l9Jcpc5ExxjWDxeRwX7gWcySy/fuRa5QdL4/fBkhyq2A9l9PemRNrlMkDVszzle+CrsOuC oO92O1c4jnZZiNNulaag7Gc8Cy1nL06MRXBjy8iRCc7Gi/WUGoqI3jQ3mq1hYaY1DD+NPdJxUUsa6n Q4cNA3k92DyW42TIAnN4JKA9JP0Wx76oe1Z61xj0V88QKShYFORoAc5c8h63u6o1zG1kkm2yjDnPRN dcCK5GFcbjJbThlo5N4oMUjfQyBvEfhAcF+7dReWngXVsKtVxchUU0gEO8X/12xYWGZ+qpuULguYZq 0mlb8FldXYcgurMFXN8B9d2AoNjidUez7XkNIm2KDfwy7cm+lK7IG0dJkTWh/BfrElcUSgWw0uu/jN W7kTsCyLXhZRi2Q+rgogE9yAwLJaKIUpjzVPbnyJSYvKcR1nwxBRVqN5RBkyJa6MpzI6TK/Q3vcTjJ tAKt/qI0Dk3MLXri1wMJi2dS4LKVNbUxMjX5rYafKK6nO9EKH+r/8jx+6GX6xSqwNrV4dMi9s471Ek xkaWUNjgLPbIdmnMotNEAKNC4Z7oNkCXQN9QHalvBptIc9wvvmf4qVsI05niR5MdN7JlPhhAqsKXFc YPJQbaYm1cpzfhOelWQqRc+OHjrXWcLIZfq/6L8JDV7VSRZvnQj6zke+L6iw== X-Developer-Key: i=jcormier@criticallink.com; a=openpgp; fpr=FF328CEA09E66D63136754DFDCD7FD2E0B36EBAA X-Spam-Status: No, score=-0.2 required=5.0 tests=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?1762265220492827995?= X-GMAIL-MSGID: =?utf-8?q?1762265220492827995?= 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 Reviewed-by: Neil Armstrong Signed-off-by: Jonathan Cormier --- 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); }