On Sat, Apr 18, 2020 at 08:07:01PM +0300, Dmitry Osipenko wrote:
> 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@xxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
