kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm/imx: parallel-display: add bridge support

Browse source 
Add support for bridge chips connected externally to the i.MX
DISP0/DISP1 DPI interfaces.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2016-06-27 15:26:31 +02:00
parent 76ecd9c9fb
commit f140b0cc77
1 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
drivers/gpu/drm/imx/parallel-display.c
View file

@ -35,6 +35,7 @@ struct imx_parallel_display {
u32 bus_format; u32 bus_format;
struct drm_display_mode mode; struct drm_display_mode mode;
struct drm_panel *panel; struct drm_panel *panel;
struct drm_bridge *bridge;
}; };
static inline struct imx_parallel_display *con_to_imxpd(struct drm_connector *c) static inline struct imx_parallel_display *con_to_imxpd(struct drm_connector *c)
@ -181,15 +182,29 @@ static int imx_pd_register(struct drm_device *drm,
drm_encoder_init(drm, encoder, &imx_pd_encoder_funcs, drm_encoder_init(drm, encoder, &imx_pd_encoder_funcs,
DRM_MODE_ENCODER_NONE, NULL); DRM_MODE_ENCODER_NONE, NULL);
drm_connector_helper_add(&imxpd->connector, if (!imxpd->bridge) {
&imx_pd_connector_helper_funcs); drm_connector_helper_add(&imxpd->connector,
drm_connector_init(drm, &imxpd->connector, &imx_pd_connector_funcs, &imx_pd_connector_helper_funcs);
DRM_MODE_CONNECTOR_VGA); drm_connector_init(drm, &imxpd->connector,
&imx_pd_connector_funcs,
DRM_MODE_CONNECTOR_VGA);
}
if (imxpd->panel) if (imxpd->panel)
drm_panel_attach(imxpd->panel, &imxpd->connector); drm_panel_attach(imxpd->panel, &imxpd->connector);
drm_mode_connector_attach_encoder(&imxpd->connector, encoder); if (imxpd->bridge) {
imxpd->bridge->encoder = encoder;
encoder->bridge = imxpd->bridge;
ret = drm_bridge_attach(drm, imxpd->bridge);
if (ret < 0) {
dev_err(imxpd->dev, "failed to attach bridge: %d\n",
ret);
return ret;
}
} else {
drm_mode_connector_attach_encoder(&imxpd->connector, encoder);
}
return 0; return 0;
} }
@ -232,13 +247,30 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
struct device_node *remote; struct device_node *remote;
remote = of_graph_get_remote_port_parent(ep); remote = of_graph_get_remote_port_parent(ep);
of_node_put(ep); if (!remote) {
if (remote) { dev_warn(dev, "endpoint %s not connected\n",
imxpd->panel = of_drm_find_panel(remote); ep->full_name);
of_node_put(remote); of_node_put(ep);
return -ENODEV;
} }
if (!imxpd->panel) of_node_put(ep);
imxpd->panel = of_drm_find_panel(remote);
if (imxpd->panel) {
dev_dbg(dev, "found panel %s\n", remote->full_name);
} else {
imxpd->bridge = of_drm_find_bridge(remote);
if (imxpd->bridge)
dev_dbg(dev, "found bridge %s\n",
remote->full_name);
}
if (!imxpd->panel && !imxpd->bridge) {
dev_dbg(dev, "waiting for panel or bridge %s\n",
remote->full_name);
of_node_put(remote);
return -EPROBE_DEFER; return -EPROBE_DEFER;
}
of_node_put(remote);
} }
imxpd->dev = dev; imxpd->dev = dev;