Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80185567 authored by Ajay Kumar's avatar Ajay Kumar Committed by Thierry Reding
Browse files

drm/exynos: dp: support drm_bridge 



Modify driver to support drm_bridge.

Signed-off-by: default avatarAjay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Tested-by: default avatarRahul Sharma <rahul.sharma@samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Tested-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tested-by: default avatarSjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 6a1688ae

Documentation/devicetree/bindings/video/exynos_dp.txt

+12 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ Optional properties for dp-controller: 
		Hotplug detect GPIO.

			Indicates which GPIO should be used for hotplug

			detection

	-video interfaces: Device node can contain video interface port

			    nodes according to [1].



[1]: Documentation/devicetree/bindings/media/video-interfaces.txt



Example:
@@ -105,4 +109,12 @@ Board Specific portion: 
				vsync-len = <6>;

			};

		};



		ports {

			port@0 {

				dp_out: endpoint {

					remote-endpoint = <&bridge_in>;

				};

			};

		};

	};

drivers/gpu/drm/exynos/exynos_dp_core.c

+31 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/interrupt.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_graph.h>

#include <linux/gpio.h>

#include <linux/component.h>

#include <linux/phy/phy.h>
@@ -994,9 +995,19 @@ static struct drm_connector_helper_funcs exynos_dp_connector_helper_funcs = { 
};



/* returns the number of bridges attached */

static int exynos_drm_attach_lcd_bridge(struct drm_device *dev,

static int exynos_drm_attach_lcd_bridge(struct exynos_dp_device *dp,

		struct drm_encoder *encoder)

{

	int ret;



	encoder->bridge = dp->bridge;

	dp->bridge->encoder = encoder;

	ret = drm_bridge_attach(encoder->dev, dp->bridge);

	if (ret) {

		DRM_ERROR("Failed to attach bridge to drm\n");

		return ret;

	}



	return 0;

}
@@ -1010,9 +1021,11 @@ static int exynos_dp_create_connector(struct exynos_drm_display *display, 
	dp->encoder = encoder;



	/* Pre-empt DP connector creation if there's a bridge */

	ret = exynos_drm_attach_lcd_bridge(dp->drm_dev, encoder);

	if (ret)

	if (dp->bridge) {

		ret = exynos_drm_attach_lcd_bridge(dp, encoder);

		if (!ret)

			return 0;

	}



	connector->polled = DRM_CONNECTOR_POLL_HPD;
@@ -1219,7 +1232,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) 
		}

	}



	if (!dp->panel) {

	if (!dp->panel && !dp->bridge) {

		ret = exynos_dp_dt_parse_panel(dp);

		if (ret)

			return ret;
@@ -1303,7 +1316,7 @@ static const struct component_ops exynos_dp_ops = { 
static int exynos_dp_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *panel_node;

	struct device_node *panel_node, *bridge_node, *endpoint;

	struct exynos_dp_device *dp;

	int ret;
@@ -1329,6 +1342,18 @@ static int exynos_dp_probe(struct platform_device *pdev) 
			return -EPROBE_DEFER;

	}



	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);

	if (endpoint) {

		bridge_node = of_graph_get_remote_port_parent(endpoint);

		if (bridge_node) {

			dp->bridge = of_drm_find_bridge(bridge_node);

			of_node_put(bridge_node);

			if (!dp->bridge)

				return -EPROBE_DEFER;

		} else

			return -EPROBE_DEFER;

	}



	ret = component_add(&pdev->dev, &exynos_dp_ops);

	if (ret)

		exynos_drm_component_del(&pdev->dev,

drivers/gpu/drm/exynos/exynos_dp_core.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ struct exynos_dp_device { 
	struct drm_connector	connector;

	struct drm_encoder	*encoder;

	struct drm_panel	*panel;

	struct drm_bridge	*bridge;

	struct clk		*clock;

	unsigned int		irq;

	void __iomem		*reg_base;