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: 13283786 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57068C0015E for ; Sun, 18 Jun 2023 08:51:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1AADC10E106; Sun, 18 Jun 2023 08:51:10 +0000 (UTC) Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by gabe.freedesktop.org (Postfix) with ESMTPS id 114F910E106 for ; Sun, 18 Jun 2023 08:51:07 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-30fcde6a73cso1711636f8f.2 for ; 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=KufoNBlQS+pzFeKCOeMVYoPDiUX93uFVjTsSsDSBN0l0WSvDcVKKq/iOufq0DlsF1d kN9X6aqx0cuN+vqJNHJoh/WlS3dvGlpx6MkvJsfhrVw3RBeFoGiobvN3PTzBSu0WSbgH WEzg7t9AmtLZKG6CcdQIO3mCOftwYo2KFDWe73ZEnNBReZMxhz8BH7+WvONul4Gn4L49 lzjiOJfLBPftP65ZpPBQcSVfxx3ej7EL/+5LCNNMbOS0WtTm5xY5xyqT+iIfEtGAwKSD BipRyiwOM2eXAwgWUDWXNCMlB21rI0IaB8HjH9tSJq4PtCxOWtbb3jO7woM0faS6QF8R +hnA== X-Gm-Message-State: AC+VfDy7e0d2Xcv6jK3rdKr8jID1gfNXlGCmAOu0OXxTDFfk/dc0yfOF 5JY8xaZC4S1G0iabYxDWLy8= X-Google-Smtp-Source: ACHHUZ5iAvnY9+VrzTEbxe/zrg7W9+3kiDTUUX8UossRPNVMZs6v+1EbD8nADrl6LsmsWR+fqeDpOA== 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 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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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) { From patchwork Sun Jun 18 08:50:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Svyatoslav Ryhel X-Patchwork-Id: 13283787 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24E93C001B1 for ; Sun, 18 Jun 2023 08:51:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C33F10E10D; Sun, 18 Jun 2023 08:51:15 +0000 (UTC) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAF0C10E060 for ; Sun, 18 Jun 2023 08:51:08 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-311367a3e12so654743f8f.2 for ; Sun, 18 Jun 2023 01:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687078267; x=1689670267; 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=+eioE0Dis/Lnd49iTib7LFRjx3tgvM39Dyou5eggWEA=; b=ceBN8iB14EtLu3N9xvBpe9SzqP7Os5abcLksAlPhYUzXLfD4RHOGOk2v6l4z6gb71k gxhqw4m+s7fo337qXycjAjAILc/sorK8GhXj5Kyc7NfI7MvETAtTe1JEeLDiBnV0OWDF TGuCXfO8ePw3M6AWjMzEcQdrEvGt7q+uZpr2eFJggEpn3jarFKo4i6MzEik9iXtQ0gps eP8AgN0n/PXiPihZtBGhBEDc0sgybtB8xyHkIaNHXAY25+kpPsF1WA9Tk1dwle1XdHgd HIvXd3wEv+lgzMR6cxOnMVtFqnmezrG7fn2iQ+i3qrA/i8GrJpUuSbLxKqKKLvGMhnBJ Rakg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687078267; x=1689670267; 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=+eioE0Dis/Lnd49iTib7LFRjx3tgvM39Dyou5eggWEA=; b=cUjlkaNtYyK3HQZJofOXKTdj418UTotX7YAhwsijg+OqXC7IgDwAbHwdyXLoFPW4Ny e7d0g0C24kZboj8z+UH+yk15Mi6Ma0PqFvGlsy+0+8ds5tQ0BPro3KgSJ+ddZnTojVUU U5q7an4lMg7+rhjKy1R83/kEkWmp1EIF75764xYHXbjeQlleCr318bIWc7HbO2CTuB9e 86lsPXsUZiiZV5lugfKD5F10POGNurR2mM9Cx0S4rZh4RVhucixSPdB+WwhqIuu6PR14 d4hfPUMbGKiJXtECgPbqC+mtZeFaWlBoH/4LlUjVVTphv8YwsXFJHDImOxlzAnzwDzDm +zug== X-Gm-Message-State: AC+VfDy05sxmJNuUzWdBQwjI7ZExiJ9X3gAwRZoBXK4PWjEspwJ3/GqJ HWHqQV9z0EG5Iz9mof7aQAJcRa+DU/IcYw== X-Google-Smtp-Source: ACHHUZ7sQ0q3MRbhfTSqs8mEnL122mAB9a+9gkcgc+dp3fUXAmNDA3vWeeBZKNPeuH2w+FYy18K1oQ== X-Received: by 2002:a5d:5751:0:b0:30f:c943:f925 with SMTP id q17-20020a5d5751000000b0030fc943f925mr5509586wrw.49.1687078266824; Sun, 18 Jun 2023 01:51:06 -0700 (PDT) Received: from xeon.. ([188.163.112.79]) by smtp.gmail.com with ESMTPSA id i17-20020adfded1000000b00301a351a8d6sm6953550wrn.84.2023.06.18.01.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 01:51:06 -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 Subject: [PATCH v2 2/2] ARM: tegra: transformers: add connector node Date: Sun, 18 Jun 2023 11:50:46 +0300 Message-Id: <20230618085046.10081-3-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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" All ASUS Transformers have micro-HDMI connector directly available. After Tegra HDMI got bridge/connector support, we should use connector framework for proper HW description. Tested-by: Andreas Westman Dorcsak # ASUS TF T30 Tested-by: Robert Eckelmann # ASUS TF101 T20 Tested-by: Svyatoslav Ryhel # ASUS TF201 T30 Signed-off-by: Svyatoslav Ryhel --- arch/arm/boot/dts/tegra20-asus-tf101.dts | 22 ++++++++++++++++--- .../dts/tegra30-asus-transformer-common.dtsi | 21 ++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-asus-tf101.dts b/arch/arm/boot/dts/tegra20-asus-tf101.dts index c2a9c3fb5b33..97350f566539 100644 --- a/arch/arm/boot/dts/tegra20-asus-tf101.dts +++ b/arch/arm/boot/dts/tegra20-asus-tf101.dts @@ -82,9 +82,11 @@ hdmi@54280000 { pll-supply = <&hdmi_pll_reg>; hdmi-supply = <&vdd_hdmi_en>; - nvidia,ddc-i2c-bus = <&hdmi_ddc>; - nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7) - GPIO_ACTIVE_HIGH>; + port@0 { + hdmi_out: endpoint { + remote-endpoint = <&connector_in>; + }; + }; }; }; @@ -963,6 +965,20 @@ clk32k_in: clock-32k-in { #clock-cells = <0>; }; + connector { + compatible = "hdmi-connector"; + type = "d"; + + hpd-gpios = <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; + ddc-i2c-bus = <&hdmi_ddc>; + + port { + connector_in: endpoint { + remote-endpoint = <&hdmi_out>; + }; + }; + }; + cpus { cpu0: cpu@0 { cpu-supply = <&vdd_cpu>; diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi index bdb898ad6262..153d34a012bd 100644 --- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi +++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi @@ -80,8 +80,11 @@ hdmi: hdmi@54280000 { pll-supply = <&vdd_1v8_vio>; vdd-supply = <&vdd_3v3_sys>; - nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; - nvidia,ddc-i2c-bus = <&hdmi_ddc>; + port@0 { + hdmi_out: endpoint { + remote-endpoint = <&connector_in>; + }; + }; }; }; @@ -1492,6 +1495,20 @@ clk32k_in: clock-32k { clock-output-names = "pmic-oscillator"; }; + connector { + compatible = "hdmi-connector"; + type = "d"; + + hpd-gpios = <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; + ddc-i2c-bus = <&hdmi_ddc>; + + port { + connector_in: endpoint { + remote-endpoint = <&hdmi_out>; + }; + }; + }; + cpus { cpu0: cpu@0 { cpu-supply = <&vdd_cpu>;