From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Osipenko Subject: [PATCH v4 2/3] drm/tegra: output: Support DRM bridges Date: Fri, 17 Apr 2020 20:52:37 +0300 Message-ID: <20200417175238.27154-3-digetx@gmail.com> References: <20200417175238.27154-1-digetx@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200417175238.27154-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Thierry Reding , Sam Ravnborg , Laurent Pinchart Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org Newer Tegra device-trees will specify a video output graph which involves a bridge. This patch adds initial support for the DRM bridges to the Tegra's DRM output. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/drm.h | 2 ++ drivers/gpu/drm/tegra/output.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 804869799305..cccd368b6752 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -116,6 +117,7 @@ struct tegra_output { struct device_node *of_node; struct device *dev; + struct drm_bridge *bridge; struct drm_panel *panel; struct i2c_adapter *ddc; const struct edid *edid; diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index a6a711d54e88..ec0cd4a1ced1 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -5,6 +5,7 @@ */ #include +#include #include #include @@ -92,13 +93,23 @@ static irqreturn_t hpd_irq(int irq, void *data) int tegra_output_probe(struct tegra_output *output) { - struct device_node *ddc, *panel; + struct device_node *ddc, *panel, *port; unsigned long flags; int err, size; if (!output->of_node) output->of_node = output->dev->of_node; + port = of_get_child_by_name(output->of_node, "port"); + if (port) { + err = drm_of_find_panel_or_bridge(output->of_node, 0, 0, NULL, + &output->bridge); + of_node_put(port); + + if (err) + return err; + } + panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { output->panel = of_drm_find_panel(panel); -- 2.26.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4548AC2D0EF for ; Sat, 18 Apr 2020 09:26:19 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EF74721D82 for ; Sat, 18 Apr 2020 09:26:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lgjOoqNq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF74721D82 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8540A6E183; Sat, 18 Apr 2020 09:26:16 +0000 (UTC) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id D38056E124 for ; Fri, 17 Apr 2020 17:54:52 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id q22so2969069ljg.0 for ; Fri, 17 Apr 2020 10:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wz/cPTE8kMVij9chCAHM9jmhnQSQFkeUt4WN8AQKozw=; b=lgjOoqNqwgEKCq/1F/bKkbgM6VBQoN+T9/MnpqycC7++jIXWK9d99r1tCqWUnRZosv iDk/HHbQZVYxpPbOy0kSzA7AQhi5+2HtLxdwK2AuqZ2rH6ZJALBtjK5Km1NU12vs2d2Z JqzHVt+Ufl1CCIIAjvaXmLbYaHiEnE/jQdIMAjSCBP8dVMdACXR+T5GYNXVwI7PepUnJ faeo1t97uMM75EVL5Tv0CVXUCZw5/aWyua/zVbvdr+1XNPnpO59n2JpQtpN9tLLcCowr 0zk6/+u2RiZfXEAtd5cv9xo4u/xgpUiw5c3lXci6UnB1lc3waSAKQRycyT8YEbwVLZcM rBWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wz/cPTE8kMVij9chCAHM9jmhnQSQFkeUt4WN8AQKozw=; b=TCrAPDTug3zpKwdlGu+S1Stp1TVarttCCJZGS5C6FbWv70YKfCtSQfUH5trqNcKYCN whu6RRlUjBcxzP8h5EVea3byAPKQC3VqlhuQF8hm9WvTVnCJCRtM8qQlThOK36wq5ODl HGjDxfzmVc3UkkawUdMlDxIp1iR5ZIdfU6yOhWcESMkTcT/uKCkMHVc9d5M4TK/29JAx p/AfUfnXdvwxVJiPGWm/8S3IAtU5IpiKqfIo9bQOsPjOhfh+BoZEtA9GE0jPld/4IR0o kOXatRs1/98741ZPeNG0TKra7NziC0FiBu8IELj9HOjs0HtgeDn26KXo89zsXccPvDrh NTyg== X-Gm-Message-State: AGi0PuasAiPY7/DPOfdt3dd06qxBrdpnSZwnW+enlWJzt1TW5bwBS7tS 6DqxrlrPXOdW2nrCCMUa2mI= X-Google-Smtp-Source: APiQypKBYY3x7qO73+HDOn2c5cUVwJifMFdMk8fGmZVY3f2S5Uj7xsolZU8I3NbfB7jGWJoAWYyCIg== X-Received: by 2002:a2e:914f:: with SMTP id q15mr2842890ljg.238.1587146091297; Fri, 17 Apr 2020 10:54:51 -0700 (PDT) Received: from localhost.localdomain (ppp91-78-208-152.pppoe.mtu-net.ru. [91.78.208.152]) by smtp.gmail.com with ESMTPSA id j15sm7204358lja.71.2020.04.17.10.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 10:54:50 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Sam Ravnborg , Laurent Pinchart Subject: [PATCH v4 2/3] drm/tegra: output: Support DRM bridges Date: Fri, 17 Apr 2020 20:52:37 +0300 Message-Id: <20200417175238.27154-3-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200417175238.27154-1-digetx@gmail.com> References: <20200417175238.27154-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 18 Apr 2020 09:26:15 +0000 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, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Newer Tegra device-trees will specify a video output graph which involves a bridge. This patch adds initial support for the DRM bridges to the Tegra's DRM output. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/drm.h | 2 ++ drivers/gpu/drm/tegra/output.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 804869799305..cccd368b6752 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -116,6 +117,7 @@ struct tegra_output { struct device_node *of_node; struct device *dev; + struct drm_bridge *bridge; struct drm_panel *panel; struct i2c_adapter *ddc; const struct edid *edid; diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index a6a711d54e88..ec0cd4a1ced1 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -5,6 +5,7 @@ */ #include +#include #include #include @@ -92,13 +93,23 @@ static irqreturn_t hpd_irq(int irq, void *data) int tegra_output_probe(struct tegra_output *output) { - struct device_node *ddc, *panel; + struct device_node *ddc, *panel, *port; unsigned long flags; int err, size; if (!output->of_node) output->of_node = output->dev->of_node; + port = of_get_child_by_name(output->of_node, "port"); + if (port) { + err = drm_of_find_panel_or_bridge(output->of_node, 0, 0, NULL, + &output->bridge); + of_node_put(port); + + if (err) + return err; + } + panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { output->panel = of_drm_find_panel(panel); -- 2.26.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel