[PATCH 4/5] drm/rockchip: vop2: add support for the rgb output block

[Michael Riesch]

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.rie...@wolfvision.net>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c 
b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 94fddbf70ff6..16041c79d228 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -39,6 +39,7 @@
 #include "rockchip_drm_gem.h"
 #include "rockchip_drm_fb.h"
 #include "rockchip_drm_vop2.h"
+#include "rockchip_rgb.h"
 
 /*
  * VOP2 architecture
@@ -212,6 +213,9 @@ struct vop2 {
        struct clk *hclk;
        struct clk *aclk;
 
+       /* optional internal rgb encoder */
+       struct rockchip_rgb *rgb;
+
        /* must be put at the end of the struct */
        struct vop2_win win[];
 };
@@ -2697,11 +2701,25 @@ static int vop2_bind(struct device *dev, struct device 
*master, void *data)
        if (ret)
                return ret;
 
+       vop2->rgb = rockchip_rgb_init(dev, &vop2->vps[2].crtc, vop2->drm, 2);
+       if (IS_ERR(vop2->rgb)) {
+               if (PTR_ERR(vop2->rgb) == -EPROBE_DEFER) {
+                       ret = PTR_ERR(vop2->rgb);
+                       goto err_crtcs;
+               }
+               vop2->rgb = NULL;
+       }
+
        rockchip_drm_dma_init_device(vop2->drm, vop2->dev);
 
        pm_runtime_enable(&pdev->dev);
 
        return 0;
+
+err_crtcs:
+       vop2_destroy_crtcs(vop2);
+
+       return ret;
 }
 
 static void vop2_unbind(struct device *dev, struct device *master, void *data)
@@ -2710,6 +2728,9 @@ static void vop2_unbind(struct device *dev, struct device 
*master, void *data)
 
        pm_runtime_disable(dev);
 
+       if (vop2->rgb)
+               rockchip_rgb_fini(vop2->rgb);
+
        vop2_destroy_crtcs(vop2);
 }
 
-- 
2.30.2