From patchwork Sat Feb 18 11:17:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 58912 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp326709wrn; Sat, 18 Feb 2023 03:18:41 -0800 (PST) X-Google-Smtp-Source: AK7set/HSMdEInIav9T2q7Ll5pT4pxVn/4RG6sd05Z9JbmDI+tE6kciugyMqb0/3jP4DihjvMvAK X-Received: by 2002:a17:906:f20a:b0:8b1:30da:b586 with SMTP id gt10-20020a170906f20a00b008b130dab586mr3183110ejb.49.1676719121328; Sat, 18 Feb 2023 03:18:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676719121; cv=none; d=google.com; s=arc-20160816; b=wKPu6RxCiKkMmb9wIhMD/6g3bU0YZzLTSGfe+duuurx8FKYZILJfHqv1K8QWA2RFnU bDDlvOnZpwRGcf5nDstBRq45C3nys7oGXFqPJZUDMTkZgpW8kxF5DLhx1Wx2nlrllkJI n5eUle14PvOy1Rxrt6bCbj4GVALsetBhipsQCoIsFpYwb+6Y8Ka6S+yYZlUew9yXA7g6 5bO/uVJb6ei66eQ4Ek5vaSEd+XK7i0BpN/wtUwIsezwMANUqBegBqvy9r223hYjGuk2T T2I7m6w38VylM7InWTFbeYyW7Dmuy6+Nb3ubDLQOn82Gwh2ui614J1eJbXW7J3MAJWQy A/2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=s6dHGa2Xgzvsmpkv1OMI3GGLXSZg9rQflTYWwQPQ1MY=; b=JskTjaKxczMiVdozg7tYGD9fnsCw4ThetleEz+4ZRSTBJvdzZWX5Ze8FIJWauLECXc 55m49Y9hi3g5MBPmGgSy12z9SSGnmzFpj9DU5y9y4g+X02BjgAxV8XxcmTnaVN9f1UEg C4mniZghY74/oDV1nF1l5izb5/mobZlkxuNBENvGUZ8U2rYlPF+DjQCpkLWrRCPUFG6l X1WYLWp/BjFt9Lb83SdsEl8QrGpGFwR/m2uO/ItJxQFUgb1BjzaFiuFm+mHcKeFtrJE9 H95PbkNqCbzfOWH81sgm2E0Yxw2hsiaVMddh5DGiBt5ClZdEZLxvts29+ta8DnuojnR1 P7FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JY77n9tl; 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=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 21-20020a170906009500b0088c5e867083si10705075ejc.807.2023.02.18.03.18.18; Sat, 18 Feb 2023 03:18: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=@chromium.org header.s=google header.b=JY77n9tl; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229601AbjBRLRt (ORCPT + 99 others); Sat, 18 Feb 2023 06:17:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbjBRLRr (ORCPT ); Sat, 18 Feb 2023 06:17:47 -0500 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C64E71E9C2 for ; Sat, 18 Feb 2023 03:17:34 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id w1so623721plq.10 for ; Sat, 18 Feb 2023 03:17:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s6dHGa2Xgzvsmpkv1OMI3GGLXSZg9rQflTYWwQPQ1MY=; b=JY77n9tlE/HK4ICl9GMTuT3xOecSN1t2rBwKN2r6bw9DpB3ugVZniqFJmEP/ZS6pdn FZrSdrEN79gLPWOMUK+L66wCzzs3r3Q8uln5PXzclN7b87DKiNVjqYU3DiNx/XLz0qPb Of7YZ4EvDZl+ErstHa8fMnpIbvTchMOkO2RII= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s6dHGa2Xgzvsmpkv1OMI3GGLXSZg9rQflTYWwQPQ1MY=; b=d+N0DN4XS8E4EOzpn3kOF0vwwG58DP3q4zknQ+mOo4HU0z3x/jzctrh6Qz+B2+G/TO GhCQK5cGellc0P5bqhTAMf9T+RaOb5NhcxImZzM528QprECEiW7T96v8rSnJWzicIxW7 mgbztEoQCwJj2YXEOgz4TROCFv9ysMxcOlas69VG/bSD58/+6OvjKqpoQgmy6b4Jexv/ 3oariZ4Tr7h+oGWC5RblAwu0zRtbiob6JMMa1RMyps1mjuYHNSX4DGQnOhwY8cppS+NS x1zrmaLMctYecXMWxmB8xF2NfVtIr61UpPgqyIPb5kNxptwiiLmW8PvlCoEjFVmI1d2o sptQ== X-Gm-Message-State: AO0yUKVKCWClOLlCmfOH+tBsoS7LYxuf+57qZvjtxWlR7eWxWShCfLde Cer8NpDFNcevxdsy9Mhog/Wsog== X-Received: by 2002:a05:6a20:4e27:b0:c6:858d:81b7 with SMTP id gk39-20020a056a204e2700b000c6858d81b7mr3115816pzb.25.1676719054085; Sat, 18 Feb 2023 03:17:34 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:88dd:be84:8f65:fec2]) by smtp.gmail.com with ESMTPSA id 23-20020aa79157000000b005a8686b72fcsm4457829pfi.75.2023.02.18.03.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 03:17:33 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Benson Leung Cc: Chun-Kuang Hu , devicetree@vger.kernel.org, Nicolas Boichat , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org, Guenter Roeck , Matthias Brugger , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, Philipp Zabel , linux-arm-kernel@lists.infradead.org, Pin-yen Lin Subject: [PATCH v3 2/5] drm/bridge: Add .get_edid callback for anx7688 driver Date: Sat, 18 Feb 2023 19:17:09 +0800 Message-Id: <20230218111712.2380225-3-treapking@chromium.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230218111712.2380225-1-treapking@chromium.org> References: <20230218111712.2380225-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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?1758167429424180233?= X-GMAIL-MSGID: =?utf-8?q?1758167429424180233?= Allow the driver to read EDID when ddc-i2c-bus phandle is present in the device node. Signed-off-by: Pin-yen Lin --- Changes in v3: - New in v3 drivers/gpu/drm/bridge/cros-ec-anx7688.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/gpu/drm/bridge/cros-ec-anx7688.c b/drivers/gpu/drm/bridge/cros-ec-anx7688.c index fa91bdeddef0..a16294c87940 100644 --- a/drivers/gpu/drm/bridge/cros-ec-anx7688.c +++ b/drivers/gpu/drm/bridge/cros-ec-anx7688.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -91,14 +92,24 @@ static bool cros_ec_anx7688_bridge_mode_fixup(struct drm_bridge *bridge, return totalbw >= requiredbw; } +static struct edid *cros_ec_anx7688_get_edid(struct drm_bridge *bridge, + struct drm_connector *connector) +{ + struct cros_ec_anx7688 *anx7688 = bridge_to_cros_ec_anx7688(bridge); + + return drm_get_edid(connector, anx7688->bridge.ddc); +} + static const struct drm_bridge_funcs cros_ec_anx7688_bridge_funcs = { .mode_fixup = cros_ec_anx7688_bridge_mode_fixup, + .get_edid = cros_ec_anx7688_get_edid, }; static int cros_ec_anx7688_bridge_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct cros_ec_anx7688 *anx7688; + struct device_node *phandle; u16 vendor, device, fw_version; u8 buffer[4]; int ret; @@ -153,6 +164,19 @@ static int cros_ec_anx7688_bridge_probe(struct i2c_client *client) DRM_WARN("Old ANX7688 FW version (0x%04x), not filtering\n", fw_version); + + phandle = of_parse_phandle(dev->of_node, "ddc-i2c-bus", 0); + if (phandle) { + anx7688->bridge.ddc = of_get_i2c_adapter_by_node(phandle); + of_node_put(phandle); + if (!anx7688->bridge.ddc) + return -EPROBE_DEFER; + } else { + dev_dbg(dev, "No I2C bus specified, disabling EDID readout\n"); + } + if (anx7688->bridge.ddc) + anx7688->bridge.ops |= DRM_BRIDGE_OP_EDID; + anx7688->bridge.funcs = &cros_ec_anx7688_bridge_funcs; drm_bridge_add(&anx7688->bridge);