From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Sam Ravnborg <sam@ravnborg.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com> Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 4/6] drm/tegra: output: Support DRM bridges Date: Sat, 18 Apr 2020 20:07:01 +0300 [thread overview] Message-ID: <20200418170703.1583-5-digetx@gmail.com> (raw) In-Reply-To: <20200418170703.1583-1-digetx@gmail.com> 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 DRM output. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/gpu/drm/tegra/drm.h | 2 ++ drivers/gpu/drm/tegra/output.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) 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 <linux/of_gpio.h> #include <drm/drm_atomic.h> +#include <drm/drm_bridge.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> @@ -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..ccd1421f1b24 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -5,6 +5,7 @@ */ #include <drm/drm_atomic_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_simple_kms_helper.h> @@ -99,8 +100,19 @@ int tegra_output_probe(struct tegra_output *output) if (!output->of_node) output->of_node = output->dev->of_node; + err = drm_of_find_panel_or_bridge(output->of_node, -1, -1, + &output->panel, &output->bridge); + if (err && err != -ENODEV) + return err; + panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { + /* + * Don't mix nvidia,panel phandle with the graph in a + * device-tree. + */ + WARN_ON(output->panel || output->bridge); + output->panel = of_drm_find_panel(panel); of_node_put(panel); -- 2.26.0
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <digetx@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Sam Ravnborg <sam@ravnborg.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com> Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v5 4/6] drm/tegra: output: Support DRM bridges Date: Sat, 18 Apr 2020 20:07:01 +0300 [thread overview] Message-ID: <20200418170703.1583-5-digetx@gmail.com> (raw) In-Reply-To: <20200418170703.1583-1-digetx@gmail.com> 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 DRM output. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/gpu/drm/tegra/drm.h | 2 ++ drivers/gpu/drm/tegra/output.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) 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 <linux/of_gpio.h> #include <drm/drm_atomic.h> +#include <drm/drm_bridge.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> @@ -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..ccd1421f1b24 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -5,6 +5,7 @@ */ #include <drm/drm_atomic_helper.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_simple_kms_helper.h> @@ -99,8 +100,19 @@ int tegra_output_probe(struct tegra_output *output) if (!output->of_node) output->of_node = output->dev->of_node; + err = drm_of_find_panel_or_bridge(output->of_node, -1, -1, + &output->panel, &output->bridge); + if (err && err != -ENODEV) + return err; + panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { + /* + * Don't mix nvidia,panel phandle with the graph in a + * device-tree. + */ + WARN_ON(output->panel || output->bridge); + output->panel = of_drm_find_panel(panel); of_node_put(panel); -- 2.26.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-04-18 17:07 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-18 17:06 [PATCH v5 0/6] Support DRM bridges on NVIDIA Tegra Dmitry Osipenko 2020-04-18 17:06 ` Dmitry Osipenko 2020-04-18 17:06 ` Dmitry Osipenko 2020-04-18 17:06 ` [PATCH v5 1/6] of_graph: add of_graph_get_local_port() Dmitry Osipenko 2020-04-18 17:06 ` Dmitry Osipenko [not found] ` <20200418170703.1583-2-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-30 14:10 ` Rob Herring 2020-04-30 14:10 ` Rob Herring 2020-04-30 14:10 ` Rob Herring 2020-05-06 16:32 ` Sam Ravnborg 2020-05-06 16:32 ` Sam Ravnborg 2020-05-06 16:32 ` Sam Ravnborg 2020-05-11 20:27 ` Rob Herring 2020-05-11 20:27 ` Rob Herring 2020-04-18 17:06 ` [PATCH v5 2/6] drm/of: Make drm_of_find_panel_or_bridge() to check graph's presence Dmitry Osipenko 2020-04-18 17:06 ` Dmitry Osipenko [not found] ` <20200418170703.1583-3-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-05-06 16:41 ` Sam Ravnborg 2020-05-06 16:41 ` Sam Ravnborg 2020-05-06 16:41 ` Sam Ravnborg [not found] ` <20200506164133.GB19296-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> 2020-05-06 17:05 ` Dmitry Osipenko 2020-05-06 17:05 ` Dmitry Osipenko 2020-05-06 17:05 ` Dmitry Osipenko 2020-04-18 17:07 ` [PATCH v5 3/6] drm/tegra: output: Don't leak OF node on error Dmitry Osipenko 2020-04-18 17:07 ` Dmitry Osipenko [not found] ` <20200418170703.1583-4-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-05-06 16:42 ` Sam Ravnborg 2020-05-06 16:42 ` Sam Ravnborg 2020-05-06 16:42 ` Sam Ravnborg 2020-04-18 17:07 ` Dmitry Osipenko [this message] 2020-04-18 17:07 ` [PATCH v5 4/6] drm/tegra: output: Support DRM bridges Dmitry Osipenko [not found] ` <20200418170703.1583-5-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-05-06 16:43 ` Sam Ravnborg 2020-05-06 16:43 ` Sam Ravnborg 2020-05-06 16:43 ` Sam Ravnborg 2020-04-18 17:07 ` [PATCH v5 5/6] drm/tegra: output: rgb: Support LVDS encoder bridge Dmitry Osipenko 2020-04-18 17:07 ` Dmitry Osipenko [not found] ` <20200418170703.1583-6-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-05-06 16:45 ` Sam Ravnborg 2020-05-06 16:45 ` Sam Ravnborg 2020-05-06 16:45 ` Sam Ravnborg [not found] ` <20200418170703.1583-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-18 17:07 ` [PATCH v5 6/6] drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge Dmitry Osipenko 2020-04-18 17:07 ` Dmitry Osipenko 2020-04-18 17:07 ` Dmitry Osipenko [not found] ` <20200418170703.1583-7-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2020-04-25 17:02 ` Sam Ravnborg 2020-04-25 17:02 ` Sam Ravnborg 2020-04-25 17:02 ` Sam Ravnborg [not found] ` <20200425170237.GA20498-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> 2020-04-25 21:51 ` Dmitry Osipenko 2020-04-25 21:51 ` Dmitry Osipenko 2020-04-25 21:51 ` Dmitry Osipenko 2020-05-24 18:41 ` [PATCH v5 0/6] Support DRM bridges on NVIDIA Tegra Dmitry Osipenko 2020-05-24 18:41 ` Dmitry Osipenko 2020-05-24 18:41 ` Dmitry Osipenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200418170703.1583-5-digetx@gmail.com \ --to=digetx@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=frowand.list@gmail.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=sam@ravnborg.org \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.