Commit 51c0e618 authored by Yongqiang Niu's avatar Yongqiang Niu Committed by Matthias Brugger
Browse files

soc / drm: mediatek: Move DDP component defines into mtk-mmsys.h 



MMSYS is the driver which controls the routing of these DDP components,
so the definition of the mtk_ddp_comp_id enum should be placed in mtk-mmsys.h

Signed-off-by: default avatarYongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://lore.kernel.org/r/20201006193320.405529-2-enric.balletbo@collabora.com


Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 0890beb2

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h

+1 −33
Original line number Diff line number Diff line
@@ -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 {

drivers/soc/mediatek/mtk-mmsys.c

+1 −3
Original line number Diff line number Diff line
@@ -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

include/linux/soc/mediatek/mtk-mmsys.h

+33 −0
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE