27
27
#define MTK_OVL_ADAPTOR_LAYER_NUM 4
28
28
29
29
enum mtk_ovl_adaptor_comp_type {
30
- OVL_ADAPTOR_TYPE_MDP_RDMA = 0 ,
31
- OVL_ADAPTOR_TYPE_MERGE ,
32
30
OVL_ADAPTOR_TYPE_ETHDR ,
31
+ OVL_ADAPTOR_TYPE_MDP_RDMA ,
32
+ OVL_ADAPTOR_TYPE_MERGE ,
33
33
OVL_ADAPTOR_TYPE_NUM ,
34
34
};
35
35
36
36
enum mtk_ovl_adaptor_comp_id {
37
+ OVL_ADAPTOR_ETHDR0 ,
37
38
OVL_ADAPTOR_MDP_RDMA0 ,
38
39
OVL_ADAPTOR_MDP_RDMA1 ,
39
40
OVL_ADAPTOR_MDP_RDMA2 ,
@@ -46,7 +47,6 @@ enum mtk_ovl_adaptor_comp_id {
46
47
OVL_ADAPTOR_MERGE1 ,
47
48
OVL_ADAPTOR_MERGE2 ,
48
49
OVL_ADAPTOR_MERGE3 ,
49
- OVL_ADAPTOR_ETHDR0 ,
50
50
OVL_ADAPTOR_ID_MAX
51
51
};
52
52
@@ -64,9 +64,9 @@ struct mtk_disp_ovl_adaptor {
64
64
};
65
65
66
66
static const char * const private_comp_stem [OVL_ADAPTOR_TYPE_NUM ] = {
67
+ [OVL_ADAPTOR_TYPE_ETHDR ] = "ethdr" ,
67
68
[OVL_ADAPTOR_TYPE_MDP_RDMA ] = "vdo1-rdma" ,
68
69
[OVL_ADAPTOR_TYPE_MERGE ] = "merge" ,
69
- [OVL_ADAPTOR_TYPE_ETHDR ] = "ethdr" ,
70
70
};
71
71
72
72
static const struct mtk_ddp_comp_funcs ethdr = {
@@ -89,6 +89,7 @@ static const struct mtk_ddp_comp_funcs rdma = {
89
89
};
90
90
91
91
static const struct ovl_adaptor_comp_match comp_matches [OVL_ADAPTOR_ID_MAX ] = {
92
+ [OVL_ADAPTOR_ETHDR0 ] = { OVL_ADAPTOR_TYPE_ETHDR , DDP_COMPONENT_ETHDR_MIXER , 0 , & ethdr },
92
93
[OVL_ADAPTOR_MDP_RDMA0 ] = { OVL_ADAPTOR_TYPE_MDP_RDMA , DDP_COMPONENT_MDP_RDMA0 , 0 , & rdma },
93
94
[OVL_ADAPTOR_MDP_RDMA1 ] = { OVL_ADAPTOR_TYPE_MDP_RDMA , DDP_COMPONENT_MDP_RDMA1 , 1 , & rdma },
94
95
[OVL_ADAPTOR_MDP_RDMA2 ] = { OVL_ADAPTOR_TYPE_MDP_RDMA , DDP_COMPONENT_MDP_RDMA2 , 2 , & rdma },
@@ -101,7 +102,6 @@ static const struct ovl_adaptor_comp_match comp_matches[OVL_ADAPTOR_ID_MAX] = {
101
102
[OVL_ADAPTOR_MERGE1 ] = { OVL_ADAPTOR_TYPE_MERGE , DDP_COMPONENT_MERGE2 , 2 , & merge },
102
103
[OVL_ADAPTOR_MERGE2 ] = { OVL_ADAPTOR_TYPE_MERGE , DDP_COMPONENT_MERGE3 , 3 , & merge },
103
104
[OVL_ADAPTOR_MERGE3 ] = { OVL_ADAPTOR_TYPE_MERGE , DDP_COMPONENT_MERGE4 , 4 , & merge },
104
- [OVL_ADAPTOR_ETHDR0 ] = { OVL_ADAPTOR_TYPE_ETHDR , DDP_COMPONENT_ETHDR_MIXER , 0 , & ethdr },
105
105
};
106
106
107
107
void mtk_ovl_adaptor_layer_config (struct device * dev , unsigned int idx ,
@@ -399,26 +399,26 @@ void mtk_ovl_adaptor_remove_comp(struct device *dev, struct mtk_mutex *mutex)
399
399
400
400
void mtk_ovl_adaptor_connect (struct device * dev , struct device * mmsys_dev , unsigned int next )
401
401
{
402
+ mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_ETHDR_MIXER , next );
402
403
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MDP_RDMA0 , DDP_COMPONENT_MERGE1 );
403
404
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MDP_RDMA1 , DDP_COMPONENT_MERGE1 );
404
405
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MDP_RDMA2 , DDP_COMPONENT_MERGE2 );
405
406
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MERGE1 , DDP_COMPONENT_ETHDR_MIXER );
406
407
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MERGE2 , DDP_COMPONENT_ETHDR_MIXER );
407
408
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MERGE3 , DDP_COMPONENT_ETHDR_MIXER );
408
409
mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_MERGE4 , DDP_COMPONENT_ETHDR_MIXER );
409
- mtk_mmsys_ddp_connect (mmsys_dev , DDP_COMPONENT_ETHDR_MIXER , next );
410
410
}
411
411
412
412
void mtk_ovl_adaptor_disconnect (struct device * dev , struct device * mmsys_dev , unsigned int next )
413
413
{
414
+ mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_ETHDR_MIXER , next );
414
415
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MDP_RDMA0 , DDP_COMPONENT_MERGE1 );
415
416
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MDP_RDMA1 , DDP_COMPONENT_MERGE1 );
416
417
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MDP_RDMA2 , DDP_COMPONENT_MERGE2 );
417
418
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MERGE1 , DDP_COMPONENT_ETHDR_MIXER );
418
419
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MERGE2 , DDP_COMPONENT_ETHDR_MIXER );
419
420
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MERGE3 , DDP_COMPONENT_ETHDR_MIXER );
420
421
mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_MERGE4 , DDP_COMPONENT_ETHDR_MIXER );
421
- mtk_mmsys_ddp_disconnect (mmsys_dev , DDP_COMPONENT_ETHDR_MIXER , next );
422
422
}
423
423
424
424
static int ovl_adaptor_comp_get_id (struct device * dev , struct device_node * node ,
0 commit comments