drm/mediatek: Add drm ovl_adaptor sub driver for MT8195

Add drm ovl_adaptor sub driver. Bring up ovl_adaptor sub driver if
the component exists in the path.

Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: Bo-Chen Chen <rex-bc.chen@mediatek.com>
Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20230321121859.2355-7-nancy.lin@mediatek.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 7732e6b6794087127b4d2c487e1c2777a9e238ee..d40142842f85c21dc539b0ca5641f470ed476834 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -379,13 +379,17 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
        }
 
        for (i = 0; i < mtk_crtc->ddp_comp_nr - 1; i++) {
-               mtk_mmsys_ddp_connect(mtk_crtc->mmsys_dev,
-                                     mtk_crtc->ddp_comp[i]->id,
-                                     mtk_crtc->ddp_comp[i + 1]->id);
-               mtk_mutex_add_comp(mtk_crtc->mutex,
-                                       mtk_crtc->ddp_comp[i]->id);
+               if (!mtk_ddp_comp_connect(mtk_crtc->ddp_comp[i], mtk_crtc->mmsys_dev,
+                                         mtk_crtc->ddp_comp[i + 1]->id))
+                       mtk_mmsys_ddp_connect(mtk_crtc->mmsys_dev,
+                                             mtk_crtc->ddp_comp[i]->id,
+                                             mtk_crtc->ddp_comp[i + 1]->id);
+               if (!mtk_ddp_comp_add(mtk_crtc->ddp_comp[i], mtk_crtc->mutex))
+                       mtk_mutex_add_comp(mtk_crtc->mutex,
+                                          mtk_crtc->ddp_comp[i]->id);
        }
-       mtk_mutex_add_comp(mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);
+       if (!mtk_ddp_comp_add(mtk_crtc->ddp_comp[i], mtk_crtc->mutex))
+               mtk_mutex_add_comp(mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);
        mtk_mutex_enable(mtk_crtc->mutex);
 
        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
@@ -434,17 +438,22 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)
        }
 
        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)
-               mtk_mutex_remove_comp(mtk_crtc->mutex,
-                                          mtk_crtc->ddp_comp[i]->id);
+               if (!mtk_ddp_comp_remove(mtk_crtc->ddp_comp[i], mtk_crtc->mutex))
+                       mtk_mutex_remove_comp(mtk_crtc->mutex,
+                                             mtk_crtc->ddp_comp[i]->id);
        mtk_mutex_disable(mtk_crtc->mutex);
        for (i = 0; i < mtk_crtc->ddp_comp_nr - 1; i++) {
-               mtk_mmsys_ddp_disconnect(mtk_crtc->mmsys_dev,
-                                        mtk_crtc->ddp_comp[i]->id,
-                                        mtk_crtc->ddp_comp[i + 1]->id);
-               mtk_mutex_remove_comp(mtk_crtc->mutex,
-                                          mtk_crtc->ddp_comp[i]->id);
+               if (!mtk_ddp_comp_disconnect(mtk_crtc->ddp_comp[i], mtk_crtc->mmsys_dev,
+                                            mtk_crtc->ddp_comp[i + 1]->id))
+                       mtk_mmsys_ddp_disconnect(mtk_crtc->mmsys_dev,
+                                                mtk_crtc->ddp_comp[i]->id,
+                                                mtk_crtc->ddp_comp[i + 1]->id);
+               if (!mtk_ddp_comp_remove(mtk_crtc->ddp_comp[i], mtk_crtc->mutex))
+                       mtk_mutex_remove_comp(mtk_crtc->mutex,
+                                             mtk_crtc->ddp_comp[i]->id);
        }
-       mtk_mutex_remove_comp(mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);
+       if (!mtk_ddp_comp_remove(mtk_crtc->ddp_comp[i], mtk_crtc->mutex))
+               mtk_mutex_remove_comp(mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);
        mtk_crtc_ddp_clk_disable(mtk_crtc);
        mtk_mutex_unprepare(mtk_crtc->mutex);
 
@@ -876,7 +885,7 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)
 }
 
 int mtk_drm_crtc_create(struct drm_device *drm_dev,
-                       const enum mtk_ddp_comp_id *path, unsigned int path_len,
+                       const unsigned int *path, unsigned int path_len,
                        int priv_data_index)
 {
        struct mtk_drm_private *priv = drm_dev->dev_private;
@@ -906,10 +915,13 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                node = priv->comp_node[comp_id];
                comp = &priv->ddp_comp[comp_id];
 
-               if (!node) {
+               /* Not all drm components have a DTS device node, such as ovl_adaptor,
+                * which is the drm bring up sub driver
+                */
+               if (!node && comp_id != DDP_COMPONENT_DRM_OVL_ADAPTOR) {
                        dev_info(dev,
-                                "Not creating crtc %d because component %d is disabled or missing\n",
-                                crtc_i, comp_id);
+                               "Not creating crtc %d because component %d is disabled or missing\n",
+                               crtc_i, comp_id);
                        return 0;
                }
 
@@ -939,7 +951,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
        }
 
        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
-               enum mtk_ddp_comp_id comp_id = path[i];
+               unsigned int comp_id = path[i];
                struct mtk_ddp_comp *comp;
 
                comp = &priv->ddp_comp[comp_id];

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index 606f72f3592497bbce1eb7e227bf762fa068cf30..3e9046993d09bfd66efc7600af0cbdcc7bc9e000 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -16,7 +16,7 @@
 
 void mtk_drm_crtc_commit(struct drm_crtc *crtc);
 int mtk_drm_crtc_create(struct drm_device *drm_dev,
-                       const enum mtk_ddp_comp_id *path,
+                       const unsigned int *path,
                        unsigned int path_len,
                        int priv_data_index);
 int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index 4a4c1928f83de345ea8c05266219f10bac85e741..1a0c4f7e352ae66513fe369782829e8da8e9160f 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -393,6 +393,25 @@ static const struct mtk_ddp_comp_funcs ddp_ufoe = {
        .start = mtk_ufoe_start,
 };
 
+static const struct mtk_ddp_comp_funcs ddp_ovl_adaptor = {
+       .clk_enable = mtk_ovl_adaptor_clk_enable,
+       .clk_disable = mtk_ovl_adaptor_clk_disable,
+       .config = mtk_ovl_adaptor_config,
+       .start = mtk_ovl_adaptor_start,
+       .stop = mtk_ovl_adaptor_stop,
+       .layer_nr = mtk_ovl_adaptor_layer_nr,
+       .layer_config = mtk_ovl_adaptor_layer_config,
+       .register_vblank_cb = mtk_ovl_adaptor_register_vblank_cb,
+       .unregister_vblank_cb = mtk_ovl_adaptor_unregister_vblank_cb,
+       .enable_vblank = mtk_ovl_adaptor_enable_vblank,
+       .disable_vblank = mtk_ovl_adaptor_disable_vblank,
+       .dma_dev_get = mtk_ovl_adaptor_dma_dev_get,
+       .connect = mtk_ovl_adaptor_connect,
+       .disconnect = mtk_ovl_adaptor_disconnect,
+       .add = mtk_ovl_adaptor_add_comp,
+       .remove = mtk_ovl_adaptor_remove_comp,
+};
+
 static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = {
        [MTK_DISP_AAL] = "aal",
        [MTK_DISP_BLS] = "bls",
@@ -406,6 +425,7 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = {
        [MTK_DISP_OD] = "od",
        [MTK_DISP_OVL] = "ovl",
        [MTK_DISP_OVL_2L] = "ovl-2l",
+       [MTK_DISP_OVL_ADAPTOR] = "ovl_adaptor",
        [MTK_DISP_POSTMASK] = "postmask",
        [MTK_DISP_PWM] = "pwm",
        [MTK_DISP_RDMA] = "rdma",
@@ -422,53 +442,54 @@ struct mtk_ddp_comp_match {
        const struct mtk_ddp_comp_funcs *funcs;
 };
 
-static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = {
-       [DDP_COMPONENT_AAL0]            = { MTK_DISP_AAL,       0, &ddp_aal },
-       [DDP_COMPONENT_AAL1]            = { MTK_DISP_AAL,       1, &ddp_aal },
-       [DDP_COMPONENT_BLS]             = { MTK_DISP_BLS,       0, NULL },
-       [DDP_COMPONENT_CCORR]           = { MTK_DISP_CCORR,     0, &ddp_ccorr },
-       [DDP_COMPONENT_COLOR0]          = { MTK_DISP_COLOR,     0, &ddp_color },
-       [DDP_COMPONENT_COLOR1]          = { MTK_DISP_COLOR,     1, &ddp_color },
-       [DDP_COMPONENT_DITHER0]         = { MTK_DISP_DITHER,    0, &ddp_dither },
-       [DDP_COMPONENT_DP_INTF0]        = { MTK_DP_INTF,        0, &ddp_dpi },
-       [DDP_COMPONENT_DP_INTF1]        = { MTK_DP_INTF,        1, &ddp_dpi },
-       [DDP_COMPONENT_DPI0]            = { MTK_DPI,            0, &ddp_dpi },
-       [DDP_COMPONENT_DPI1]            = { MTK_DPI,            1, &ddp_dpi },
-       [DDP_COMPONENT_DSC0]            = { MTK_DISP_DSC,       0, &ddp_dsc },
-       [DDP_COMPONENT_DSC1]            = { MTK_DISP_DSC,       1, &ddp_dsc },
-       [DDP_COMPONENT_DSI0]            = { MTK_DSI,            0, &ddp_dsi },
-       [DDP_COMPONENT_DSI1]            = { MTK_DSI,            1, &ddp_dsi },
-       [DDP_COMPONENT_DSI2]            = { MTK_DSI,            2, &ddp_dsi },
-       [DDP_COMPONENT_DSI3]            = { MTK_DSI,            3, &ddp_dsi },
-       [DDP_COMPONENT_GAMMA]           = { MTK_DISP_GAMMA,     0, &ddp_gamma },
-       [DDP_COMPONENT_MERGE0]          = { MTK_DISP_MERGE,     0, &ddp_merge },
-       [DDP_COMPONENT_MERGE1]          = { MTK_DISP_MERGE,     1, &ddp_merge },
-       [DDP_COMPONENT_MERGE2]          = { MTK_DISP_MERGE,     2, &ddp_merge },
-       [DDP_COMPONENT_MERGE3]          = { MTK_DISP_MERGE,     3, &ddp_merge },
-       [DDP_COMPONENT_MERGE4]          = { MTK_DISP_MERGE,     4, &ddp_merge },
-       [DDP_COMPONENT_MERGE5]          = { MTK_DISP_MERGE,     5, &ddp_merge },
-       [DDP_COMPONENT_OD0]             = { MTK_DISP_OD,        0, &ddp_od },
-       [DDP_COMPONENT_OD1]             = { MTK_DISP_OD,        1, &ddp_od },
-       [DDP_COMPONENT_OVL0]            = { MTK_DISP_OVL,       0, &ddp_ovl },
-       [DDP_COMPONENT_OVL1]            = { MTK_DISP_OVL,       1, &ddp_ovl },
-       [DDP_COMPONENT_OVL_2L0]         = { MTK_DISP_OVL_2L,    0, &ddp_ovl },
-       [DDP_COMPONENT_OVL_2L1]         = { MTK_DISP_OVL_2L,    1, &ddp_ovl },
-       [DDP_COMPONENT_OVL_2L2]         = { MTK_DISP_OVL_2L,    2, &ddp_ovl },
-       [DDP_COMPONENT_POSTMASK0]       = { MTK_DISP_POSTMASK,  0, &ddp_postmask },
-       [DDP_COMPONENT_PWM0]            = { MTK_DISP_PWM,       0, NULL },
-       [DDP_COMPONENT_PWM1]            = { MTK_DISP_PWM,       1, NULL },
-       [DDP_COMPONENT_PWM2]            = { MTK_DISP_PWM,       2, NULL },
-       [DDP_COMPONENT_RDMA0]           = { MTK_DISP_RDMA,      0, &ddp_rdma },
-       [DDP_COMPONENT_RDMA1]           = { MTK_DISP_RDMA,      1, &ddp_rdma },
-       [DDP_COMPONENT_RDMA2]           = { MTK_DISP_RDMA,      2, &ddp_rdma },
-       [DDP_COMPONENT_RDMA4]           = { MTK_DISP_RDMA,      4, &ddp_rdma },
-       [DDP_COMPONENT_UFOE]            = { MTK_DISP_UFOE,      0, &ddp_ufoe },
-       [DDP_COMPONENT_WDMA0]           = { MTK_DISP_WDMA,      0, NULL },
-       [DDP_COMPONENT_WDMA1]           = { MTK_DISP_WDMA,      1, NULL },
+static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] = {
+       [DDP_COMPONENT_AAL0]            = { MTK_DISP_AAL,               0, &ddp_aal },
+       [DDP_COMPONENT_AAL1]            = { MTK_DISP_AAL,               1, &ddp_aal },
+       [DDP_COMPONENT_BLS]             = { MTK_DISP_BLS,               0, NULL },
+       [DDP_COMPONENT_CCORR]           = { MTK_DISP_CCORR,             0, &ddp_ccorr },
+       [DDP_COMPONENT_COLOR0]          = { MTK_DISP_COLOR,             0, &ddp_color },
+       [DDP_COMPONENT_COLOR1]          = { MTK_DISP_COLOR,             1, &ddp_color },
+       [DDP_COMPONENT_DITHER0]         = { MTK_DISP_DITHER,            0, &ddp_dither },
+       [DDP_COMPONENT_DP_INTF0]        = { MTK_DP_INTF,                0, &ddp_dpi },
+       [DDP_COMPONENT_DP_INTF1]        = { MTK_DP_INTF,                1, &ddp_dpi },
+       [DDP_COMPONENT_DPI0]            = { MTK_DPI,                    0, &ddp_dpi },
+       [DDP_COMPONENT_DPI1]            = { MTK_DPI,                    1, &ddp_dpi },
+       [DDP_COMPONENT_DRM_OVL_ADAPTOR] = { MTK_DISP_OVL_ADAPTOR,       0, &ddp_ovl_adaptor },
+       [DDP_COMPONENT_DSC0]            = { MTK_DISP_DSC,               0, &ddp_dsc },
+       [DDP_COMPONENT_DSC1]            = { MTK_DISP_DSC,               1, &ddp_dsc },
+       [DDP_COMPONENT_DSI0]            = { MTK_DSI,                    0, &ddp_dsi },
+       [DDP_COMPONENT_DSI1]            = { MTK_DSI,                    1, &ddp_dsi },
+       [DDP_COMPONENT_DSI2]            = { MTK_DSI,                    2, &ddp_dsi },
+       [DDP_COMPONENT_DSI3]            = { MTK_DSI,                    3, &ddp_dsi },
+       [DDP_COMPONENT_GAMMA]           = { MTK_DISP_GAMMA,             0, &ddp_gamma },
+       [DDP_COMPONENT_MERGE0]          = { MTK_DISP_MERGE,             0, &ddp_merge },
+       [DDP_COMPONENT_MERGE1]          = { MTK_DISP_MERGE,             1, &ddp_merge },
+       [DDP_COMPONENT_MERGE2]          = { MTK_DISP_MERGE,             2, &ddp_merge },
+       [DDP_COMPONENT_MERGE3]          = { MTK_DISP_MERGE,             3, &ddp_merge },
+       [DDP_COMPONENT_MERGE4]          = { MTK_DISP_MERGE,             4, &ddp_merge },
+       [DDP_COMPONENT_MERGE5]          = { MTK_DISP_MERGE,             5, &ddp_merge },
+       [DDP_COMPONENT_OD0]             = { MTK_DISP_OD,                0, &ddp_od },
+       [DDP_COMPONENT_OD1]             = { MTK_DISP_OD,                1, &ddp_od },
+       [DDP_COMPONENT_OVL0]            = { MTK_DISP_OVL,               0, &ddp_ovl },
+       [DDP_COMPONENT_OVL1]            = { MTK_DISP_OVL,               1, &ddp_ovl },
+       [DDP_COMPONENT_OVL_2L0]         = { MTK_DISP_OVL_2L,            0, &ddp_ovl },
+       [DDP_COMPONENT_OVL_2L1]         = { MTK_DISP_OVL_2L,            1, &ddp_ovl },
+       [DDP_COMPONENT_OVL_2L2]         = { MTK_DISP_OVL_2L,            2, &ddp_ovl },
+       [DDP_COMPONENT_POSTMASK0]       = { MTK_DISP_POSTMASK,          0, &ddp_postmask },
+       [DDP_COMPONENT_PWM0]            = { MTK_DISP_PWM,               0, NULL },
+       [DDP_COMPONENT_PWM1]            = { MTK_DISP_PWM,               1, NULL },
+       [DDP_COMPONENT_PWM2]            = { MTK_DISP_PWM,               2, NULL },
+       [DDP_COMPONENT_RDMA0]           = { MTK_DISP_RDMA,              0, &ddp_rdma },
+       [DDP_COMPONENT_RDMA1]           = { MTK_DISP_RDMA,              1, &ddp_rdma },
+       [DDP_COMPONENT_RDMA2]           = { MTK_DISP_RDMA,              2, &ddp_rdma },
+       [DDP_COMPONENT_RDMA4]           = { MTK_DISP_RDMA,              4, &ddp_rdma },
+       [DDP_COMPONENT_UFOE]            = { MTK_DISP_UFOE,              0, &ddp_ufoe },
+       [DDP_COMPONENT_WDMA0]           = { MTK_DISP_WDMA,              0, NULL },
+       [DDP_COMPONENT_WDMA1]           = { MTK_DISP_WDMA,              1, NULL },
 };
 
 static bool mtk_drm_find_comp_in_ddp(struct device *dev,
-                                    const enum mtk_ddp_comp_id *path,
+                                    const unsigned int *path,
                                     unsigned int path_len,
                                     struct mtk_ddp_comp *ddp_comp)
 {
@@ -521,7 +542,7 @@ unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
 }
 
 int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
-                     enum mtk_ddp_comp_id comp_id)
+                     unsigned int comp_id)
 {
        struct platform_device *comp_pdev;
        enum mtk_ddp_comp_type type;
@@ -530,19 +551,24 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
        int ret;
 #endif
 
-       if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
+       if (comp_id < 0 || comp_id >= DDP_COMPONENT_DRM_ID_MAX)
                return -EINVAL;
 
        type = mtk_ddp_matches[comp_id].type;
 
        comp->id = comp_id;
        comp->funcs = mtk_ddp_matches[comp_id].funcs;
-       comp_pdev = of_find_device_by_node(node);
-       if (!comp_pdev) {
-               DRM_INFO("Waiting for device %s\n", node->full_name);
-               return -EPROBE_DEFER;
+       /* Not all drm components have a DTS device node, such as ovl_adaptor,
+        * which is the drm bring up sub driver
+        */
+       if (node) {
+               comp_pdev = of_find_device_by_node(node);
+               if (!comp_pdev) {
+                       DRM_INFO("Waiting for device %s\n", node->full_name);
+                       return -EPROBE_DEFER;
+               }
+               comp->dev = &comp_pdev->dev;
        }
-       comp->dev = &comp_pdev->dev;
 
        if (type == MTK_DISP_AAL ||
            type == MTK_DISP_BLS ||
@@ -552,6 +578,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
            type == MTK_DISP_MERGE ||
            type == MTK_DISP_OVL ||
            type == MTK_DISP_OVL_2L ||
+           type == MTK_DISP_OVL_ADAPTOR ||
            type == MTK_DISP_PWM ||
            type == MTK_DISP_RDMA ||
            type == MTK_DPI ||

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index 1b03496b641ad24def5e63fbe8203da6cc5ae5b5..febcaeef16a1f2c5e6da29bf8d58865c69337efa 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/soc/mediatek/mtk-cmdq.h>
 #include <linux/soc/mediatek/mtk-mmsys.h>
+#include <linux/soc/mediatek/mtk-mutex.h>
 
 struct device;
 struct device_node;
@@ -30,6 +31,7 @@ enum mtk_ddp_comp_type {
        MTK_DISP_OD,
        MTK_DISP_OVL,
        MTK_DISP_OVL_2L,
+       MTK_DISP_OVL_ADAPTOR,
        MTK_DISP_POSTMASK,
        MTK_DISP_PWM,
        MTK_DISP_RDMA,
@@ -74,12 +76,16 @@ struct mtk_ddp_comp_funcs {
        struct device * (*dma_dev_get)(struct device *dev);
        const u32 *(*get_formats)(struct device *dev);
        size_t (*get_num_formats)(struct device *dev);
+       void (*connect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
+       void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
+       void (*add)(struct device *dev, struct mtk_mutex *mutex);
+       void (*remove)(struct device *dev, struct mtk_mutex *mutex);
 };
 
 struct mtk_ddp_comp {
        struct device *dev;
        int irq;
-       enum mtk_ddp_comp_id id;
+       unsigned int id;
        const struct mtk_ddp_comp_funcs *funcs;
 };
 
@@ -231,13 +237,51 @@ size_t mtk_ddp_comp_get_num_formats(struct mtk_ddp_comp *comp)
        return 0;
 }
 
+static inline bool mtk_ddp_comp_add(struct mtk_ddp_comp *comp, struct mtk_mutex *mutex)
+{
+       if (comp->funcs && comp->funcs->add) {
+               comp->funcs->add(comp->dev, mutex);
+               return true;
+       }
+       return false;
+}
+
+static inline bool mtk_ddp_comp_remove(struct mtk_ddp_comp *comp, struct mtk_mutex *mutex)
+{
+       if (comp->funcs && comp->funcs->remove) {
+               comp->funcs->remove(comp->dev, mutex);
+               return true;
+       }
+       return false;
+}
+
+static inline bool mtk_ddp_comp_connect(struct mtk_ddp_comp *comp, struct device *mmsys_dev,
+                                       unsigned int next)
+{
+       if (comp->funcs && comp->funcs->connect) {
+               comp->funcs->connect(comp->dev, mmsys_dev, next);
+               return true;
+       }
+       return false;
+}
+
+static inline bool mtk_ddp_comp_disconnect(struct mtk_ddp_comp *comp, struct device *mmsys_dev,
+                                          unsigned int next)
+{
+       if (comp->funcs && comp->funcs->disconnect) {
+               comp->funcs->disconnect(comp->dev, mmsys_dev, next);
+               return true;
+       }
+       return false;
+}
+
 int mtk_ddp_comp_get_id(struct device_node *node,
                        enum mtk_ddp_comp_type comp_type);
 unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
                                                struct device *dev);
 int mtk_ddp_comp_init(struct device_node *comp_node, struct mtk_ddp_comp *comp,
-                     enum mtk_ddp_comp_id comp_id);
-enum mtk_ddp_comp_type mtk_ddp_comp_get_type(enum mtk_ddp_comp_id comp_id);
+                     unsigned int comp_id);
+enum mtk_ddp_comp_type mtk_ddp_comp_get_type(unsigned int comp_id);
 void mtk_ddp_write(struct cmdq_pkt *cmdq_pkt, unsigned int value,
                   struct cmdq_client_reg *cmdq_reg, void __iomem *regs,
                   unsigned int offset);

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index bd3dd2706825394d843b992841f9c9db32d55059..f689e6750974e4d385a4cd6754ec4a5b06fd3144 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -58,7 +58,7 @@ static const struct drm_mode_config_funcs mtk_drm_mode_config_funcs = {
        .atomic_commit = drm_atomic_helper_commit,
 };
 
-static const enum mtk_ddp_comp_id mt2701_mtk_ddp_main[] = {
+static const unsigned int mt2701_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_RDMA0,
        DDP_COMPONENT_COLOR0,
@@ -66,12 +66,12 @@ static const enum mtk_ddp_comp_id mt2701_mtk_ddp_main[] = {
        DDP_COMPONENT_DSI0,
 };
 
-static const enum mtk_ddp_comp_id mt2701_mtk_ddp_ext[] = {
+static const unsigned int mt2701_mtk_ddp_ext[] = {
        DDP_COMPONENT_RDMA1,
        DDP_COMPONENT_DPI0,
 };
 
-static const enum mtk_ddp_comp_id mt7623_mtk_ddp_main[] = {
+static const unsigned int mt7623_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_RDMA0,
        DDP_COMPONENT_COLOR0,
@@ -79,12 +79,12 @@ static const enum mtk_ddp_comp_id mt7623_mtk_ddp_main[] = {
        DDP_COMPONENT_DPI0,
 };
 
-static const enum mtk_ddp_comp_id mt7623_mtk_ddp_ext[] = {
+static const unsigned int mt7623_mtk_ddp_ext[] = {
        DDP_COMPONENT_RDMA1,
        DDP_COMPONENT_DSI0,
 };
 
-static const enum mtk_ddp_comp_id mt2712_mtk_ddp_main[] = {
+static const unsigned int mt2712_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_COLOR0,
        DDP_COMPONENT_AAL0,
@@ -94,7 +94,7 @@ static const enum mtk_ddp_comp_id mt2712_mtk_ddp_main[] = {
        DDP_COMPONENT_PWM0,
 };
 
-static const enum mtk_ddp_comp_id mt2712_mtk_ddp_ext[] = {
+static const unsigned int mt2712_mtk_ddp_ext[] = {
        DDP_COMPONENT_OVL1,
        DDP_COMPONENT_COLOR1,
        DDP_COMPONENT_AAL1,
@@ -104,13 +104,13 @@ static const enum mtk_ddp_comp_id mt2712_mtk_ddp_ext[] = {
        DDP_COMPONENT_PWM1,
 };
 
-static const enum mtk_ddp_comp_id mt2712_mtk_ddp_third[] = {
+static const unsigned int mt2712_mtk_ddp_third[] = {
        DDP_COMPONENT_RDMA2,
        DDP_COMPONENT_DSI3,
        DDP_COMPONENT_PWM2,
 };
 
-static enum mtk_ddp_comp_id mt8167_mtk_ddp_main[] = {
+static unsigned int mt8167_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_COLOR0,
        DDP_COMPONENT_CCORR,
@@ -121,7 +121,7 @@ static enum mtk_ddp_comp_id mt8167_mtk_ddp_main[] = {
        DDP_COMPONENT_DSI0,
 };
 
-static const enum mtk_ddp_comp_id mt8173_mtk_ddp_main[] = {
+static const unsigned int mt8173_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_COLOR0,
        DDP_COMPONENT_AAL0,
@@ -132,7 +132,7 @@ static const enum mtk_ddp_comp_id mt8173_mtk_ddp_main[] = {
        DDP_COMPONENT_PWM0,
 };
 
-static const enum mtk_ddp_comp_id mt8173_mtk_ddp_ext[] = {
+static const unsigned int mt8173_mtk_ddp_ext[] = {
        DDP_COMPONENT_OVL1,
        DDP_COMPONENT_COLOR1,
        DDP_COMPONENT_GAMMA,
@@ -140,7 +140,7 @@ static const enum mtk_ddp_comp_id mt8173_mtk_ddp_ext[] = {
        DDP_COMPONENT_DPI0,
 };
 
-static const enum mtk_ddp_comp_id mt8183_mtk_ddp_main[] = {
+static const unsigned int mt8183_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_OVL_2L0,
        DDP_COMPONENT_RDMA0,
@@ -152,13 +152,13 @@ static const enum mtk_ddp_comp_id mt8183_mtk_ddp_main[] = {
        DDP_COMPONENT_DSI0,
 };
 
-static const enum mtk_ddp_comp_id mt8183_mtk_ddp_ext[] = {
+static const unsigned int mt8183_mtk_ddp_ext[] = {
        DDP_COMPONENT_OVL_2L1,
        DDP_COMPONENT_RDMA1,
        DDP_COMPONENT_DPI0,
 };
 
-static const enum mtk_ddp_comp_id mt8186_mtk_ddp_main[] = {
+static const unsigned int mt8186_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_RDMA0,
        DDP_COMPONENT_COLOR0,
@@ -170,13 +170,13 @@ static const enum mtk_ddp_comp_id mt8186_mtk_ddp_main[] = {
        DDP_COMPONENT_DSI0,
 };
 
-static const enum mtk_ddp_comp_id mt8186_mtk_ddp_ext[] = {
+static const unsigned int mt8186_mtk_ddp_ext[] = {
        DDP_COMPONENT_OVL_2L0,
        DDP_COMPONENT_RDMA1,
        DDP_COMPONENT_DPI0,
 };
 
-static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = {
+static const unsigned int mt8192_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_OVL_2L0,
        DDP_COMPONENT_RDMA0,
@@ -189,13 +189,13 @@ static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = {
        DDP_COMPONENT_DSI0,
 };
 
-static const enum mtk_ddp_comp_id mt8192_mtk_ddp_ext[] = {
+static const unsigned int mt8192_mtk_ddp_ext[] = {
        DDP_COMPONENT_OVL_2L2,
        DDP_COMPONENT_RDMA4,
        DDP_COMPONENT_DPI0,
 };
 
-static const enum mtk_ddp_comp_id mt8195_mtk_ddp_main[] = {
+static const unsigned int mt8195_mtk_ddp_main[] = {
        DDP_COMPONENT_OVL0,
        DDP_COMPONENT_RDMA0,
        DDP_COMPONENT_COLOR0,
@@ -381,9 +381,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)
 {
        struct mtk_drm_private *private = drm->dev_private;
        struct mtk_drm_private *priv_n;
-       struct platform_device *pdev;
-       struct device_node *np = NULL;
-       struct device *dma_dev;
+       struct device *dma_dev = NULL;
        int ret, i, j;
 
        if (drm_firmware_drivers_only())
@@ -427,7 +425,6 @@ static int mtk_drm_kms_init(struct drm_device *drm)
         *    different drm private data structures. Loop through crtc index to
         *    create crtc from the main path and then ext_path and finally the
         *    third path.
-        * 3. Use OVL device for all DMA memory allocations
         */
        for (i = 0; i < MAX_CRTC; i++) {
                for (j = 0; j < private->data->mmsys_dev_num; j++) {
@@ -439,9 +436,6 @@ static int mtk_drm_kms_init(struct drm_device *drm)
                                if (ret)
                                        goto err_component_unbind;
 
-                               if (!np)
-                                       np = priv_n->comp_node[priv_n->data->main_path[0]];
-
                                continue;
                        } else if (i == 1 && priv_n->data->ext_len) {
                                ret = mtk_drm_crtc_create(drm, priv_n->data->ext_path,
@@ -449,9 +443,6 @@ static int mtk_drm_kms_init(struct drm_device *drm)
                                if (ret)
                                        goto err_component_unbind;
 
-                               if (!np)
-                                       np = priv_n->comp_node[priv_n->data->ext_path[0]];
-
                                continue;
                        } else if (i == 2 && priv_n->data->third_len) {
                                ret = mtk_drm_crtc_create(drm, priv_n->data->third_path,
@@ -459,22 +450,19 @@ static int mtk_drm_kms_init(struct drm_device *drm)
                                if (ret)
                                        goto err_component_unbind;
 
-                               if (!np)
-                                       np = priv_n->comp_node[priv_n->data->third_path[0]];
-
                                continue;
                        }
                }
        }
 
-       pdev = of_find_device_by_node(np);
-       if (!pdev) {
+       /* Use OVL device for all DMA memory allocations */
+       dma_dev = mtk_drm_crtc_dma_dev_get(drm_crtc_from_index(drm, 0));
+       if (!dma_dev) {
                ret = -ENODEV;
                dev_err(drm->dev, "Need at least one OVL device\n");
                goto err_component_unbind;
        }
 
-       dma_dev = &pdev->dev;
        for (i = 0; i < private->data->mmsys_dev_num; i++)
                private->all_drm_private[i]->dma_dev = dma_dev;
 
@@ -548,6 +536,11 @@ static const struct drm_driver mtk_drm_driver = {
        .minor = DRIVER_MINOR,
 };
 
+static int compare_dev(struct device *dev, void *data)
+{
+       return dev == (struct device *)data;
+}
+
 static int mtk_drm_bind(struct device *dev)
 {
        struct mtk_drm_private *private = dev_get_drvdata(dev);
@@ -746,6 +739,7 @@ static int mtk_drm_probe(struct platform_device *pdev)
        struct mtk_drm_private *private;
        struct device_node *node;
        struct component_match *match = NULL;
+       struct platform_device *ovl_adaptor;
        int ret;
        int i;
 
@@ -771,6 +765,18 @@ static int mtk_drm_probe(struct platform_device *pdev)
        if (!private->all_drm_private)
                return -ENOMEM;
 
+       /* Bringup ovl_adaptor */
+       if (mtk_drm_find_mmsys_comp(private, DDP_COMPONENT_DRM_OVL_ADAPTOR)) {
+               ovl_adaptor = platform_device_register_data(dev, "mediatek-disp-ovl-adaptor",
+                                                           PLATFORM_DEVID_AUTO,
+                                                           (void *)private->mmsys_dev,
+                                                           sizeof(*private->mmsys_dev));
+               private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
+               mtk_ddp_comp_init(NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
+                                 DDP_COMPONENT_DRM_OVL_ADAPTOR);
+               component_match_add(dev, &match, compare_dev, &ovl_adaptor->dev);
+       }
+
        /* Iterate over sibling DISP function blocks */
        for_each_child_of_node(phandle->parent, node) {
                const struct of_device_id *of_id;
@@ -824,6 +830,7 @@ static int mtk_drm_probe(struct platform_device *pdev)
                    comp_type == MTK_DISP_MERGE ||
                    comp_type == MTK_DISP_OVL ||
                    comp_type == MTK_DISP_OVL_2L ||
+                   comp_type == MTK_DISP_OVL_ADAPTOR ||
                    comp_type == MTK_DISP_RDMA ||
                    comp_type == MTK_DP_INTF ||
                    comp_type == MTK_DPI ||
@@ -861,7 +868,7 @@ err_pm:
        pm_runtime_disable(dev);
 err_node:
        of_node_put(private->mutex_node);
-       for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
+       for (i = 0; i < DDP_COMPONENT_DRM_ID_MAX; i++)
                of_node_put(private->comp_node[i]);
        return ret;
 }
@@ -874,7 +881,7 @@ static int mtk_drm_remove(struct platform_device *pdev)
        component_master_del(&pdev->dev, &mtk_drm_ops);
        pm_runtime_disable(&pdev->dev);
        of_node_put(private->mutex_node);
-       for (i = 0; i < DDP_COMPONENT_ID_MAX; i++)
+       for (i = 0; i < DDP_COMPONENT_DRM_ID_MAX; i++)
                of_node_put(private->comp_node[i]);
 
        return 0;
@@ -923,6 +930,7 @@ static struct platform_driver * const mtk_drm_drivers[] = {
        &mtk_disp_color_driver,
        &mtk_disp_gamma_driver,
        &mtk_disp_merge_driver,
+       &mtk_disp_ovl_adaptor_driver,
        &mtk_disp_ovl_driver,
        &mtk_disp_rdma_driver,
        &mtk_dpi_driver,

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index 8d3ff32b53647f20c8c04e204e19a51b5b7a8e27..eb2fd45941f09d511407d8c39320ebe5cee87854 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -11,6 +11,8 @@
 
 #define MAX_CRTC       3
 #define MAX_CONNECTOR  2
+#define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1)
+#define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)
 
 struct device;
 struct device_node;
@@ -21,11 +23,11 @@ struct drm_property;
 struct regmap;
 
 struct mtk_mmsys_driver_data {
-       const enum mtk_ddp_comp_id *main_path;
+       const unsigned int *main_path;
        unsigned int main_len;
-       const enum mtk_ddp_comp_id *ext_path;
+       const unsigned int *ext_path;
        unsigned int ext_len;
-       const enum mtk_ddp_comp_id *third_path;
+       const unsigned int *third_path;
        unsigned int third_len;
 
        bool shadow_register;
@@ -42,8 +44,8 @@ struct mtk_drm_private {
        struct device_node *mutex_node;
        struct device *mutex_dev;
        struct device *mmsys_dev;
-       struct device_node *comp_node[DDP_COMPONENT_ID_MAX];
-       struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_ID_MAX];
+       struct device_node *comp_node[DDP_COMPONENT_DRM_ID_MAX];
+       struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_DRM_ID_MAX];
        const struct mtk_mmsys_driver_data *data;
        struct drm_atomic_state *suspend_state;
        unsigned int mbox_index;