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

Commit f140b0cc authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/imx: parallel-display: add bridge support 



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

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 76ecd9c9

drivers/gpu/drm/imx/parallel-display.c

+41 −9
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct imx_parallel_display { 
	u32 bus_format;

	struct drm_display_mode mode;

	struct drm_panel *panel;

	struct drm_bridge *bridge;

};



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_MODE_ENCODER_NONE, NULL);



	if (!imxpd->bridge) {

		drm_connector_helper_add(&imxpd->connector,

				&imx_pd_connector_helper_funcs);

	drm_connector_init(drm, &imxpd->connector, &imx_pd_connector_funcs,

		drm_connector_init(drm, &imxpd->connector,

				   &imx_pd_connector_funcs,

				   DRM_MODE_CONNECTOR_VGA);

	}



	if (imxpd->panel)

		drm_panel_attach(imxpd->panel, &imxpd->connector);



	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;

}
@@ -232,14 +247,31 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) 
		struct device_node *remote;



		remote = of_graph_get_remote_port_parent(ep);

		if (!remote) {

			dev_warn(dev, "endpoint %s not connected\n",

				 ep->full_name);

			of_node_put(ep);

			return -ENODEV;

		}

		of_node_put(ep);

		if (remote) {



		imxpd->panel = of_drm_find_panel(remote);

			of_node_put(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)

		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;

		}

		of_node_put(remote);

	}



	imxpd->dev = dev;