Commit f00b9dd5 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

drm/tegra: output: Support DRM bridges 



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.

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 3d2e7aec

drivers/gpu/drm/tegra/drm.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/gpio/consumer.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;

drivers/gpu/drm/tegra/output.c

+12 −0
Original line number Diff line number Diff line
@@ -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);