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

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
...@@ -66,6 +66,10 @@ Optional properties for dp-controller: ...@@ -66,6 +66,10 @@ Optional properties for dp-controller:
Hotplug detect GPIO. Hotplug detect GPIO.
Indicates which GPIO should be used for hotplug Indicates which GPIO should be used for hotplug
detection detection
-video interfaces: Device node can contain video interface port
nodes according to [1].
[1]: Documentation/devicetree/bindings/media/video-interfaces.txt
Example: Example:
...@@ -105,4 +109,12 @@ Board Specific portion: ...@@ -105,4 +109,12 @@ Board Specific portion:
vsync-len = <6>; vsync-len = <6>;
}; };
}; };
ports {
port@0 {
dp_out: endpoint {
remote-endpoint = <&bridge_in>;
};
};
};
}; };
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/of_graph.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/phy/phy.h> #include <linux/phy/phy.h>
...@@ -994,9 +995,19 @@ static struct drm_connector_helper_funcs exynos_dp_connector_helper_funcs = { ...@@ -994,9 +995,19 @@ static struct drm_connector_helper_funcs exynos_dp_connector_helper_funcs = {
}; };
/* returns the number of bridges attached */ /* 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) 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; return 0;
} }
...@@ -1010,9 +1021,11 @@ static int exynos_dp_create_connector(struct exynos_drm_display *display, ...@@ -1010,9 +1021,11 @@ static int exynos_dp_create_connector(struct exynos_drm_display *display,
dp->encoder = encoder; dp->encoder = encoder;
/* Pre-empt DP connector creation if there's a bridge */ /* Pre-empt DP connector creation if there's a bridge */
ret = exynos_drm_attach_lcd_bridge(dp->drm_dev, encoder); if (dp->bridge) {
if (ret) ret = exynos_drm_attach_lcd_bridge(dp, encoder);
if (!ret)
return 0; return 0;
}
connector->polled = DRM_CONNECTOR_POLL_HPD; connector->polled = DRM_CONNECTOR_POLL_HPD;
...@@ -1219,7 +1232,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) ...@@ -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); ret = exynos_dp_dt_parse_panel(dp);
if (ret) if (ret)
return ret; return ret;
...@@ -1303,7 +1316,7 @@ static const struct component_ops exynos_dp_ops = { ...@@ -1303,7 +1316,7 @@ static const struct component_ops exynos_dp_ops = {
static int exynos_dp_probe(struct platform_device *pdev) static int exynos_dp_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *panel_node; struct device_node *panel_node, *bridge_node, *endpoint;
struct exynos_dp_device *dp; struct exynos_dp_device *dp;
int ret; int ret;
...@@ -1329,6 +1342,18 @@ static int exynos_dp_probe(struct platform_device *pdev) ...@@ -1329,6 +1342,18 @@ static int exynos_dp_probe(struct platform_device *pdev)
return -EPROBE_DEFER; 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); ret = component_add(&pdev->dev, &exynos_dp_ops);
if (ret) if (ret)
exynos_drm_component_del(&pdev->dev, exynos_drm_component_del(&pdev->dev,
......
...@@ -153,6 +153,7 @@ struct exynos_dp_device { ...@@ -153,6 +153,7 @@ struct exynos_dp_device {
struct drm_connector connector; struct drm_connector connector;
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_panel *panel; struct drm_panel *panel;
struct drm_bridge *bridge;
struct clk *clock; struct clk *clock;
unsigned int irq; unsigned int irq;
void __iomem *reg_base; void __iomem *reg_base;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment