Move mtk_disp_ovl.o from the DSI object list to the VIDEO_MEDIATEK_DISP_PIPELINE one, so that the eDP path can use the overlay without the DSI controller or the colour blocks. That option already groups the mmsys routing and the display RDMA, the part of the vdosys0 front end that is not specific to one output, and the eDP path drives the same OVL0 -> RDMA0 -> crossbar pipeline.
The DSI path already selects VIDEO_MEDIATEK_DISP_PIPELINE, so nothing changes for it. Signed-off-by: David Lechner <[email protected]> --- drivers/video/mediatek/Kconfig | 2 +- drivers/video/mediatek/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/mediatek/Kconfig b/drivers/video/mediatek/Kconfig index 88cf3d11b2e..6e9ad26ab54 100644 --- a/drivers/video/mediatek/Kconfig +++ b/drivers/video/mediatek/Kconfig @@ -8,7 +8,7 @@ config VIDEO_MEDIATEK_DISP_COMP bool -# mmsys routing and display RDMA, used by the DSI path +# mmsys routing, overlay and display RDMA, shared by the DSI and eDP paths config VIDEO_MEDIATEK_DISP_PIPELINE bool diff --git a/drivers/video/mediatek/Makefile b/drivers/video/mediatek/Makefile index ee3d7eed618..3bd69617b74 100644 --- a/drivers/video/mediatek/Makefile +++ b/drivers/video/mediatek/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO_MEDIATEK_DISP_COMP) += mtk_disp_comp.o \ mtk_disp_mutex.o obj-$(CONFIG_VIDEO_MEDIATEK_DISP_PIPELINE) += mtk_ddp.o \ + mtk_disp_ovl.o \ mtk_disp_rdma.o obj-$(CONFIG_VIDEO_MEDIATEK_DPI) += mtk_dpi.o @@ -19,7 +20,6 @@ obj-$(CONFIG_VIDEO_MEDIATEK_DSI) += mtk_disp_aal.o \ mtk_disp_color.o \ mtk_disp_dither.o \ mtk_disp_gamma.o \ - mtk_disp_ovl.o \ mtk_dsi.o obj-$(CONFIG_VIDEO_MEDIATEK_HDMI) += \ -- 2.53.0
