Re: [v7, PATCH 1/7] drm/mediatek: move ddp component defint into mtk_mmsys.h

Yongqiang Niu [off-list ref] 於 2020年7月23日 週四 下午6:06寫道：

On Thu, 2020-07-23 at 11:34 +0200, Enric Balletbo Serra wrote:

quoted

Hi Yongqian Niu,

Thank you for your patch

Missatge de Yongqiang Niu [off-list ref] del dia dj., 23
de jul. 2020 a les 4:05:

quoted

move ddp component defint into mtk_mmsys.h

There is a typo, should be "defines". But why you should move these
defines to mtk-mmsys?

ck do not like this :

quoted

-#include "../../gpu/drm/mediatek/mtk_drm_ddp.h"
-#include "../../gpu/drm/mediatek/mtk_drm_ddp_comp.h"

I think no one like this.

after remove this, we need move the ddp component define

type error will fixed in next version.

mmsys is the driver which control the routing of these ddp component,
so the definition of mtk_ddp_comp_id should be placed in mtk-mmsys.h

Regards,
Chun-Kuang.

quoted

quoted

Signed-off-by: Yongqiang Niu <redacted>
---
 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 34 +----------------------------
 drivers/soc/mediatek/mtk-mmsys.c            |  4 +---
 include/linux/soc/mediatek/mtk-mmsys.h      | 33 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
index debe363..161201f 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h

@@ -7,6 +7,7 @@
 #define MTK_DRM_DDP_COMP_H

 #include <linux/io.h>
+#include <linux/soc/mediatek/mtk-mmsys.h>

 struct device;
 struct device_node;

@@ -35,39 +36,6 @@ enum mtk_ddp_comp_type {
        MTK_DDP_COMP_TYPE_MAX,
 };

-enum mtk_ddp_comp_id {
-       DDP_COMPONENT_AAL0,
-       DDP_COMPONENT_AAL1,
-       DDP_COMPONENT_BLS,
-       DDP_COMPONENT_CCORR,
-       DDP_COMPONENT_COLOR0,
-       DDP_COMPONENT_COLOR1,
-       DDP_COMPONENT_DITHER,
-       DDP_COMPONENT_DPI0,
-       DDP_COMPONENT_DPI1,
-       DDP_COMPONENT_DSI0,
-       DDP_COMPONENT_DSI1,
-       DDP_COMPONENT_DSI2,
-       DDP_COMPONENT_DSI3,
-       DDP_COMPONENT_GAMMA,
-       DDP_COMPONENT_OD0,
-       DDP_COMPONENT_OD1,
-       DDP_COMPONENT_OVL0,
-       DDP_COMPONENT_OVL_2L0,
-       DDP_COMPONENT_OVL_2L1,
-       DDP_COMPONENT_OVL1,
-       DDP_COMPONENT_PWM0,
-       DDP_COMPONENT_PWM1,
-       DDP_COMPONENT_PWM2,
-       DDP_COMPONENT_RDMA0,
-       DDP_COMPONENT_RDMA1,
-       DDP_COMPONENT_RDMA2,
-       DDP_COMPONENT_UFOE,
-       DDP_COMPONENT_WDMA0,
-       DDP_COMPONENT_WDMA1,
-       DDP_COMPONENT_ID_MAX,
-};
-
 struct mtk_ddp_comp;
 struct cmdq_pkt;
 struct mtk_ddp_comp_funcs {

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index a55f255..36ad66b 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c

@@ -5,13 +5,11 @@
  */

 #include <linux/device.h>
+#include <linux/io.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/soc/mediatek/mtk-mmsys.h>

-#include "../../gpu/drm/mediatek/mtk_drm_ddp.h"
-#include "../../gpu/drm/mediatek/mtk_drm_ddp_comp.h"
-
 #define DISP_REG_CONFIG_DISP_OVL0_MOUT_EN      0x040
 #define DISP_REG_CONFIG_DISP_OVL1_MOUT_EN      0x044
 #define DISP_REG_CONFIG_DISP_OD_MOUT_EN                0x048

diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h
index 7bab5d9..2228bf6 100644
--- a/include/linux/soc/mediatek/mtk-mmsys.h
+++ b/include/linux/soc/mediatek/mtk-mmsys.h

@@ -9,6 +9,39 @@
 enum mtk_ddp_comp_id;
 struct device;

+enum mtk_ddp_comp_id {
+       DDP_COMPONENT_AAL0,
+       DDP_COMPONENT_AAL1,
+       DDP_COMPONENT_BLS,
+       DDP_COMPONENT_CCORR,
+       DDP_COMPONENT_COLOR0,
+       DDP_COMPONENT_COLOR1,
+       DDP_COMPONENT_DITHER,
+       DDP_COMPONENT_DPI0,
+       DDP_COMPONENT_DPI1,
+       DDP_COMPONENT_DSI0,
+       DDP_COMPONENT_DSI1,
+       DDP_COMPONENT_DSI2,
+       DDP_COMPONENT_DSI3,
+       DDP_COMPONENT_GAMMA,
+       DDP_COMPONENT_OD0,
+       DDP_COMPONENT_OD1,
+       DDP_COMPONENT_OVL0,
+       DDP_COMPONENT_OVL_2L0,
+       DDP_COMPONENT_OVL_2L1,
+       DDP_COMPONENT_OVL1,
+       DDP_COMPONENT_PWM0,
+       DDP_COMPONENT_PWM1,
+       DDP_COMPONENT_PWM2,
+       DDP_COMPONENT_RDMA0,
+       DDP_COMPONENT_RDMA1,
+       DDP_COMPONENT_RDMA2,
+       DDP_COMPONENT_UFOE,
+       DDP_COMPONENT_WDMA0,
+       DDP_COMPONENT_WDMA1,
+       DDP_COMPONENT_ID_MAX,
+};
+
 void mtk_mmsys_ddp_connect(struct device *dev,
                           enum mtk_ddp_comp_id cur,
                           enum mtk_ddp_comp_id next);
--

1.8.1.1.dirty

_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel