Hi, Matthias: Matthias Brugger <mbrugger@xxxxxxxx> 於 2020年4月21日 週二 下午5:31寫道: > > > > On 4/16/20 6:22 PM, Chun-Kuang Hu wrote: > > Hi, Matthias: > > > > Matthias Brugger <mbrugger@xxxxxxxx> 於 2020年3月26日 週四 下午11:45寫道: > >> > >> > >> > >> On 26/03/2020 15:51, CK Hu wrote: > >>> Hi, Matthias: > >>> > >>> On Thu, 2020-03-26 at 12:54 +0100, Matthias Brugger wrote: > >>>> Hi CK, > >>>> > >>>> On 26/03/2020 00:05, CK Hu wrote: > >>>>> Hi, Matthias: > >>>>> > >>>>> On Wed, 2020-03-25 at 17:16 +0100, Matthias Brugger wrote: > >>>>>> > >>>>>> On 11/03/2020 17:53, Enric Balletbo i Serra wrote: > >>>>>>> Provide a mtk_mmsys_ddp_connect() and mtk_mmsys_disconnect() functions to > >>>>>>> replace mtk_ddp_add_comp_to_path() and mtk_ddp_remove_comp_from_path(). > >>>>>>> Those functions will allow DRM driver and others to control the data > >>>>>>> path routing. > >>>>>>> > >>>>>>> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx> > >>>>>>> Reviewed-by: Matthias Brugger <matthias.bgg@xxxxxxxxx> > >>>>>>> Reviewed-by: CK Hu <ck.hu@xxxxxxxxxxxx> > >>>>>>> Acked-by: CK Hu <ck.hu@xxxxxxxxxxxx> > >>>>>> > >>>>>> This patch does not apply against v5.6-rc1. > >>>>>> Please rebase as this is a quite big patch and it won't be easy to do that by hand. > >>>>> > >>>>> I think this patch depends on [1] which has been acked by me and I have > >>>>> not picked it. The simple way is that you pick [1] first and then pick > >>>>> this series. > >>>>> > >>>>> [1] > >>>>> https://patchwork.kernel.org/patch/11406227/ > >>>>> > >>>> > >>>> You would need to provide a stable tag for me that I can merge into my tree. You > >>>> can also try to merge my for-next [1] which has the newest version from Enric. > >>>> If you see any merge conflict, then we have to do something about it :) > >>>> > >>>> Regards, > >>>> Matthias > >>>> > >>>> [1] > >>>> https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/log/?h=for-next > >>>> > >>> > >>> You have applied this series, so I would not apply other patches which > >>> would conflict with this series. After this series land on main stream > >>> (wish it happen in this merge window), I would rebase other patch on > >>> main stream. > >>> > >> > >> I haven't (yet) send the pull request. If you want to bring in your patches in > >> v5.7 as well we can find a solution to that. Shall I provide you with a stable > >> branch which you can merge? This way you can add all your patches in the pull > >> request as well and we don't have to wait for v5.8 to get things into mainline. > >> > >> Let me know and I'll provide you with a stable branch. > > > > This series is in linux-next but does not in main stream. So would you > > please provide a stable branch so I could pull this series? > > > > Please find the pull request below: > > The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136: > > Linux 5.7-rc1 (2020-04-12 12:35:55 -0700) > > are available in the Git repository at: > > > https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/ > tags/v5.7-next-drm-stable > > for you to fetch changes up to 667c769246b01c53ad0925d603d2a2531abd3ef2: > > soc / drm: mediatek: Fix mediatek-drm device probing (2020-04-13 > 13:01:16 +0200) > > ---------------------------------------------------------------- > Enric Balletbo i Serra (3): > dt-bindings: mediatek: Update mmsys binding to reflect it is a > system controller > soc / drm: mediatek: Move routing control to mmsys device > soc / drm: mediatek: Fix mediatek-drm device probing > > Matthias Brugger (2): > drm/mediatek: Omit warning on probe defers > clk / soc: mediatek: Move mt8173 MMSYS to platform driver > > Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt | 7 +-- > drivers/clk/mediatek/Kconfig | 7 +++ > drivers/clk/mediatek/Makefile | 1 + > drivers/clk/mediatek/clk-mt8173-mm.c | 146 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/clk/mediatek/clk-mt8173.c | 104 > ------------------------------------------ > drivers/gpu/drm/mediatek/Kconfig | 1 + > drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 ++- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 ++- > drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 ++- > drivers/gpu/drm/mediatek/mtk_dpi.c | 12 > +++-- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 19 > ++++---- > drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 259 > +-------------------------------------------------------------------------------------------------------- > drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 7 --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 45 > ++++++++++--------- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- > drivers/gpu/drm/mediatek/mtk_dsi.c | 8 > +++- > drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- > drivers/soc/mediatek/Kconfig | 8 > ++++ > drivers/soc/mediatek/Makefile | 1 + > drivers/soc/mediatek/mtk-mmsys.c | 337 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/soc/mediatek/mtk-mmsys.h | 20 > +++++++++ > 21 files changed, 592 insertions(+), 411 deletions(-) > create mode 100644 drivers/clk/mediatek/clk-mt8173-mm.c > create mode 100644 drivers/soc/mediatek/mtk-mmsys.c > create mode 100644 include/linux/soc/mediatek/mtk-mmsys.h Pulled into mediatek-drm-next [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next Regards, Chun-Kuang. > > > > > Regards, > > Chun-Kuang. > > > >> > >> Regards, > >> Matthias > >> > >>> Regards, > >>> CK > >>> > >>>>> Regards, > >>>>> CK > >>>>> > >>>>>> > >>>>>> Regards, > >>>>>> Matthias > >>>>>> > >>>>>>> --- > >>>>>>>