drm/mediatek: separate color module to fixup error memory reallocation

[karo-tx-linux.git] / drivers / gpu / drm / mediatek / mtk_drm_ddp_comp.c

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
index 8b52416b6e41c6b0576679009a5d89ec9a437364..07d7ea2268eff7b4b3e43cca47fbd889c2d2fa99 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
@@ -38,13 +38,6 @@
 
 #define DISP_REG_UFO_START                     0x0000
 
-#define DISP_COLOR_CFG_MAIN                    0x0400
-#define DISP_COLOR_START_MT2701                        0x0f00
-#define DISP_COLOR_START_MT8173                        0x0c00
-#define DISP_COLOR_START(comp)                 ((comp)->data->color_offset)
-#define DISP_COLOR_WIDTH(comp)                 (DISP_COLOR_START(comp) + 0x50)
-#define DISP_COLOR_HEIGHT(comp)                        (DISP_COLOR_START(comp) + 0x54)
-
 #define DISP_AAL_EN                            0x0000
 #define DISP_AAL_SIZE                          0x0030
 
@@ -55,9 +48,6 @@
 
 #define LUT_10BIT_MASK                         0x03ff
 
-#define COLOR_BYPASS_ALL                       BIT(7)
-#define COLOR_SEQ_SEL                          BIT(13)
-
 #define OD_RELAYMODE                           BIT(0)
 
 #define UFO_BYPASS                             BIT(2)
@@ -82,20 +72,6 @@
 #define DITHER_ADD_LSHIFT_G(x)                 (((x) & 0x7) << 4)
 #define DITHER_ADD_RSHIFT_G(x)                 (((x) & 0x7) << 0)
 
-struct mtk_disp_color_data {
-       unsigned int color_offset;
-};
-
-struct mtk_disp_color {
-       struct mtk_ddp_comp                     ddp_comp;
-       const struct mtk_disp_color_data        *data;
-};
-
-static inline struct mtk_disp_color *comp_to_color(struct mtk_ddp_comp *comp)
-{
-       return container_of(comp, struct mtk_disp_color, ddp_comp);
-}
-
 void mtk_dither_set(struct mtk_ddp_comp *comp, unsigned int bpc,
                    unsigned int CFG)
 {
@@ -119,25 +95,6 @@ void mtk_dither_set(struct mtk_ddp_comp *comp, unsigned int bpc,
        }
 }
 
-static void mtk_color_config(struct mtk_ddp_comp *comp, unsigned int w,
-                            unsigned int h, unsigned int vrefresh,
-                            unsigned int bpc)
-{
-       struct mtk_disp_color *color = comp_to_color(comp);
-
-       writel(w, comp->regs + DISP_COLOR_WIDTH(color));
-       writel(h, comp->regs + DISP_COLOR_HEIGHT(color));
-}
-
-static void mtk_color_start(struct mtk_ddp_comp *comp)
-{
-       struct mtk_disp_color *color = comp_to_color(comp);
-
-       writel(COLOR_BYPASS_ALL | COLOR_SEQ_SEL,
-              comp->regs + DISP_COLOR_CFG_MAIN);
-       writel(0x1, comp->regs + DISP_COLOR_START(color));
-}
-
 static void mtk_od_config(struct mtk_ddp_comp *comp, unsigned int w,
                          unsigned int h, unsigned int vrefresh,
                          unsigned int bpc)
@@ -229,11 +186,6 @@ static const struct mtk_ddp_comp_funcs ddp_gamma = {
        .stop = mtk_gamma_stop,
 };
 
-static const struct mtk_ddp_comp_funcs ddp_color = {
-       .config = mtk_color_config,
-       .start = mtk_color_start,
-};
-
 static const struct mtk_ddp_comp_funcs ddp_od = {
        .config = mtk_od_config,
        .start = mtk_od_start,
@@ -268,8 +220,8 @@ struct mtk_ddp_comp_match {
 static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = {
        [DDP_COMPONENT_AAL]     = { MTK_DISP_AAL,       0, &ddp_aal },
        [DDP_COMPONENT_BLS]     = { MTK_DISP_BLS,       0, NULL },
-       [DDP_COMPONENT_COLOR0]  = { MTK_DISP_COLOR,     0, &ddp_color },
-       [DDP_COMPONENT_COLOR1]  = { MTK_DISP_COLOR,     1, &ddp_color },
+       [DDP_COMPONENT_COLOR0]  = { MTK_DISP_COLOR,     0, NULL },
+       [DDP_COMPONENT_COLOR1]  = { MTK_DISP_COLOR,     1, NULL },
        [DDP_COMPONENT_DPI0]    = { MTK_DPI,            0, NULL },
        [DDP_COMPONENT_DSI0]    = { MTK_DSI,            0, NULL },
        [DDP_COMPONENT_DSI1]    = { MTK_DSI,            1, NULL },
@@ -286,22 +238,6 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = {
        [DDP_COMPONENT_WDMA1]   = { MTK_DISP_WDMA,      1, NULL },
 };
 
-static const struct mtk_disp_color_data mt2701_color_driver_data = {
-       .color_offset = DISP_COLOR_START_MT2701,
-};
-
-static const struct mtk_disp_color_data mt8173_color_driver_data = {
-       .color_offset = DISP_COLOR_START_MT8173,
-};
-
-static const struct of_device_id mtk_disp_color_driver_dt_match[] = {
-       { .compatible = "mediatek,mt2701-disp-color",
-         .data = &mt2701_color_driver_data},
-       { .compatible = "mediatek,mt8173-disp-color",
-         .data = &mt8173_color_driver_data},
-       {},
-};
-
 int mtk_ddp_comp_get_id(struct device_node *node,
                        enum mtk_ddp_comp_type comp_type)
 {
@@ -324,23 +260,11 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node,
        enum mtk_ddp_comp_type type;
        struct device_node *larb_node;
        struct platform_device *larb_pdev;
-       const struct of_device_id *match;
-       struct mtk_disp_color *color;
 
        if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
                return -EINVAL;
 
        type = mtk_ddp_matches[comp_id].type;
-       if (type == MTK_DISP_COLOR) {
-               devm_kfree(dev, comp);
-               color = devm_kzalloc(dev, sizeof(*color), GFP_KERNEL);
-               if (!color)
-                       return -ENOMEM;
-
-               match = of_match_node(mtk_disp_color_driver_dt_match, node);
-               color->data = match->data;
-               comp = &color->ddp_comp;
-       }
 
        comp->id = comp_id;
        comp->funcs = funcs ?: mtk_ddp_matches[comp_id].funcs;