From patchwork Sun Jun 18 08:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Svyatoslav Ryhel X-Patchwork-Id: 109592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2361151vqr; Sun, 18 Jun 2023 01:57:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yUZC7+W+cqZpwtyGr5b11gyDFL4jnyMUH5G6qrqdIlsIbCYDnYkIABBU6AyQbLPXvNoKW X-Received: by 2002:a05:6830:8b:b0:6b2:9bca:dab4 with SMTP id a11-20020a056830008b00b006b29bcadab4mr4607144oto.38.1687078667770; Sun, 18 Jun 2023 01:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687078667; cv=none; d=google.com; s=arc-20160816; b=F1ttn51Uc4O/bdW32gISfyQ4BPXWIIohC0/1L9samxbFF0Zm69EzCT5pQHZoBWvEqN 3sYgUguHP2vjfOFFa8C213b+WjBRU7ifQQZYFunFActGKodDdcYFzgxtIL7cqxFRwRR2 TV43/m7+IXFPpk89EUzHM7A5CrIdrBwKynwa9xv+ElsJ3kvn/iav9wqiM0PDUpMk/bXc YLOfSv2pbD35l+4d4E/DYsZkM0bIcHfTtvuET9iijU0u+Ot2PF+7Plz8n3WRz9yeFHcs n1Yv3EHzShfTQfR74lWSeQBk7ImIcKVHYHrH45u4YWL0XdDGrEICvGCQKHI0C/JHwvH5 q/yA== 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=QTMdpVu9zcROFMVsz6T+C+h5mIKmLtZWdHwxQBCPR5I=; b=AP6pS/qVSeJ1kD9pAeZI87tX75bF6wToL92SNXFo1oUiWDyNwUuoCrMTpm7x7oYmce jtpvQsVkI/TddKye81PzKBcdff3I2iRGJxg02CNZD0mH5IeBg2WJAdsJGc+WruyD0NON Irln/TH0icw4nY7OgAFkDw5DEQAM9YPE+1shSghC6ZuRhGzKMdx0avxpVbr7ax039HuJ IVaM0bHOcCVo3lCPmNsSmevoTcV65mAVuBhqIKu+b6FsWPp+LaeEUW0Wx97OsJkgTN4T 8Yel2h16HI8i4e/zPPYxOK18ZTUxPTQoDnJkb1mBH/ws5kZHuaiWXsOr53UOCeQ+1txc sedg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=Fh8hIlVo; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b62-20020a62cf41000000b00666982292a2si900724pfg.166.2023.06.18.01.57.35; Sun, 18 Jun 2023 01:57:47 -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=@gmail.com header.s=20221208 header.b=Fh8hIlVo; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229718AbjFRIvQ (ORCPT + 99 others); Sun, 18 Jun 2023 04:51:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229494AbjFRIvI (ORCPT ); Sun, 18 Jun 2023 04:51:08 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A284A10E3; Sun, 18 Jun 2023 01:51:07 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-30e412a852dso1722922f8f.0; Sun, 18 Jun 2023 01:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687078266; x=1689670266; 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=QTMdpVu9zcROFMVsz6T+C+h5mIKmLtZWdHwxQBCPR5I=; b=Fh8hIlVoS/wbv8OUsIwPmLZWva6mur0bFHpAaMXzlEg1EecvqfhJu85SH0R81LOwah RpuQXxAEb17Y929Muoxw2ubuKpIrRsf9/xy9zX10xPx8ArlyxJMnQAxKKrL5tQpQbT+d RntyAiIDMzb+sy2anfFq19RHzYPz3tmH6qvtgiuw33PrU8EpIYFqcbghjpdm49YuOT7n ait5W1W+In7qWdR9A0cNijeR2jHJmXiWbjtS/rcJJDFqMlv/ARdirrdH61IHIzBUk8Ll VIYelOfN8W6PFAhJBnwb/OoWyRzsXk8C6wE2NE7vMiO7XX+0v6+nJgUf9XxjLQBVqt4m 6lmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687078266; x=1689670266; 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=QTMdpVu9zcROFMVsz6T+C+h5mIKmLtZWdHwxQBCPR5I=; b=HaV9wyb83FsreDyfW2VHRAwpOcpsHcWeMgiZpBHZOtWbXKb2Nq2QEjHAMrf9ErwHY1 LaXQwixxnFEWszxVUz82CLoXf7kTy46FdpwVoaAnxia6+9+udX70mk+iutYYHZ3VEcVO 7n1yicmWC1+IiBSnBgjTizHhSlRej98eansWmr9iPxxOz2scGBTYDhSot733D6o36Wtr DObg14KvZdvcRSrdIV/5cT3H38pLQiB3mPJBy79pZiMVL5B+GsreDrlY0ewEml+rTJPD FYt6RM1YNrWQRmrD3Rt83mkIltzYPDLQ6Tj2fItNJcgXdtT/1QMipA6/Oz8gAbV8qWgn H0Tg== X-Gm-Message-State: AC+VfDy4SuWMz/2s5vdwdxctqQHa491R2zZJ+AKlTH3oBTL12ihnngup ZAT2WxQBXiU6aRIMRAvM/L0= X-Received: by 2002:adf:d092:0:b0:30f:c7e4:d207 with SMTP id y18-20020adfd092000000b0030fc7e4d207mr3606483wrh.61.1687078265669; Sun, 18 Jun 2023 01:51:05 -0700 (PDT) Received: from xeon.. ([188.163.112.79]) by smtp.gmail.com with ESMTPSA id i17-20020adfded1000000b00301a351a8d6sm6953550wrn.84.2023.06.18.01.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 01:51:05 -0700 (PDT) From: Svyatoslav Ryhel To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thierry Reding , Jonathan Hunter , Mikko Perttunen , David Airlie , Daniel Vetter , Svyatoslav Ryhel , Maxim Schwalm , Dmitry Osipenko Cc: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/2] drm/tegra: output: hdmi: Support bridge/connector Date: Sun, 18 Jun 2023 11:50:45 +0300 Message-Id: <20230618085046.10081-2-clamor95@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230618085046.10081-1-clamor95@gmail.com> References: <20230618085046.10081-1-clamor95@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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?1769030200762426496?= X-GMAIL-MSGID: =?utf-8?q?1769030200762426496?= From: Maxim Schwalm Some Tegra device-trees may specify a video output graph, which involves MHL bridge/simple bridge and/or connector framework. This patch adds support for the bridge/connector attached to the HDMI output, allowing us to model the hardware properly. Inspired by: 29efdc2 ("drm/tegra: output: rgb: Support LVDS encoder bridge") Tested-by: Andreas Westman Dorcsak # ASUS TF T30 Tested-by: Maxim Schwalm # ASUS P1801-T T30 Tested-by: Robert Eckelmann # ASUS TF101 T20 Tested-by: Svyatoslav Ryhel # ASUS TF201 T30 Signed-off-by: Maxim Schwalm Signed-off-by: Svyatoslav Ryhel --- drivers/gpu/drm/tegra/hdmi.c | 44 +++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index 6eac54ae1205..a5b12b169e57 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -1544,26 +1545,47 @@ static int tegra_hdmi_init(struct host1x_client *client) { struct tegra_hdmi *hdmi = host1x_client_to_hdmi(client); struct drm_device *drm = dev_get_drvdata(client->host); + struct drm_connector *connector; int err; hdmi->output.dev = client->dev; - drm_connector_init_with_ddc(drm, &hdmi->output.connector, - &tegra_hdmi_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA, - hdmi->output.ddc); - drm_connector_helper_add(&hdmi->output.connector, - &tegra_hdmi_connector_helper_funcs); - hdmi->output.connector.dpms = DRM_MODE_DPMS_OFF; - drm_simple_encoder_init(drm, &hdmi->output.encoder, DRM_MODE_ENCODER_TMDS); drm_encoder_helper_add(&hdmi->output.encoder, &tegra_hdmi_encoder_helper_funcs); - drm_connector_attach_encoder(&hdmi->output.connector, - &hdmi->output.encoder); - drm_connector_register(&hdmi->output.connector); + if (hdmi->output.bridge) { + err = drm_bridge_attach(&hdmi->output.encoder, hdmi->output.bridge, + NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (err) { + dev_err(client->dev, "failed to attach bridge: %d\n", + err); + return err; + } + + connector = drm_bridge_connector_init(drm, &hdmi->output.encoder); + if (IS_ERR(connector)) { + dev_err(client->dev, + "failed to initialize bridge connector: %pe\n", + connector); + return PTR_ERR(connector); + } + + drm_connector_attach_encoder(connector, &hdmi->output.encoder); + } else { + drm_connector_init_with_ddc(drm, &hdmi->output.connector, + &tegra_hdmi_connector_funcs, + DRM_MODE_CONNECTOR_HDMIA, + hdmi->output.ddc); + drm_connector_helper_add(&hdmi->output.connector, + &tegra_hdmi_connector_helper_funcs); + hdmi->output.connector.dpms = DRM_MODE_DPMS_OFF; + + drm_connector_attach_encoder(&hdmi->output.connector, + &hdmi->output.encoder); + drm_connector_register(&hdmi->output.connector); + } err = tegra_output_init(drm, &hdmi->output); if (err < 0) {