[PATCH v2 5/6] drm/rockchip: vop2: add support for the rgb output block
Sascha Hauer
sha at pengutronix.de
Thu Jan 19 07:17:34 PST 2023
Hi Michael,
On Thu, Jan 19, 2023 at 03:39:10PM +0100, Michael Riesch wrote:
> The Rockchip VOP2 features an internal RGB output block, which can be
> attached to the video port 2 of the VOP2. Add support for this output
> block.
>
> Signed-off-by: Michael Riesch <michael.riesch at wolfvision.net>
> ---
> v2:
> - move away from wrong assumption that the RGB block is always
> connected to video port 2 -> check devicetree to find RGB block
Traces of that assumption are still in the commmit message.
>
> drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 44 ++++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> +static int vop2_find_rgb_encoder(struct vop2 *vop2)
> +{
> + struct device_node *node = vop2->dev->of_node;
> + struct device_node *endpoint;
> + int i;
> +
> + for (i = 0; i < vop2->data->nr_vps; i++) {
> + endpoint = of_graph_get_endpoint_by_regs(node, i,
> + ROCKCHIP_VOP2_EP_RGB0);
> + if (!endpoint)
> + continue;
> +
> + of_node_put(endpoint);
> + return i;
> + }
> +
> + return -ENOENT;
> +}
> +
> static struct reg_field vop2_cluster_regs[VOP2_WIN_MAX_REG] = {
> [VOP2_WIN_ENABLE] = REG_FIELD(RK3568_CLUSTER_WIN_CTRL0, 0, 0),
> [VOP2_WIN_FORMAT] = REG_FIELD(RK3568_CLUSTER_WIN_CTRL0, 1, 5),
> @@ -2698,11 +2721,29 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
> if (ret)
> return ret;
>
> + ret = vop2_find_rgb_encoder(vop2);
> + if (ret > 0) {
'0' seems to be a valid vp as well. Shouldn't this be ret >= 0?
> + vop2->rgb = rockchip_rgb_init(dev, &vop2->vps[ret].crtc,
> + vop2->drm, ret);
> + if (IS_ERR(vop2->rgb)) {
> + if (PTR_ERR(vop2->rgb) == -EPROBE_DEFER) {
> + ret = PTR_ERR(vop2->rgb);
> + goto err_crtcs;
> + }
> + vop2->rgb = NULL;
> + }
> + }
> +
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the Linux-rockchip
mailing list