| Message ID | CAAOTY_8tz9nNbCHFJhk9xX8fm9Jd8ETcdNCQfE31AOjZLpNKog@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,v2] mediatek drm next for 5.8 | expand |
On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote: > > Hi, Dave & Daniel: > > This include dpi pin mode swap, config mipi_tx current and impedance, > and some fixup. I drop drm_bridge patches in this version. > > 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/chunkuang.hu/linux.git > tags/mediatek-drm-next-5.8 > for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: Did you edit this by hand or pass it through some mailserver that chewed it up, I had to reconstruct this pull from the above bits, I've no idea why it's so messed up in the first place. Dave.
On Wed, 20 May 2020 at 15:44, Dave Airlie <airlied@gmail.com> wrote: > > On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote: > > > > Hi, Dave & Daniel: > > > > This include dpi pin mode swap, config mipi_tx current and impedance, > > and some fixup. I drop drm_bridge patches in this version. > > > > 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/chunkuang.hu/linux.git > > tags/mediatek-drm-next-5.8 > > for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: > > Did you edit this by hand or pass it through some mailserver that > chewed it up, I had to reconstruct this pull from the above bits, I've > no idea why it's so messed up in the first place. and why does it contain an unexplained backmerge? Merge tag 'v5.7-next-drm-stable' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into mediatek-drm-next Please don't ever backmerge fixes into next pull, without a long explaination or if you really need it ask us first, Please resend this again cleaned up. Dave.
Hi, Dave: Dave Airlie <airlied@gmail.com> 於 2020年5月20日 週三 下午1:44寫道： > > On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote: > > > > Hi, Dave & Daniel: > > > > This include dpi pin mode swap, config mipi_tx current and impedance, > > and some fixup. I drop drm_bridge patches in this version. > > > > 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/chunkuang.hu/linux.git > > tags/mediatek-drm-next-5.8 > > for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: > > Did you edit this by hand or pass it through some mailserver that > chewed it up, I had to reconstruct this pull from the above bits, I've > no idea why it's so messed up in the first place. The idea is that gmail would wrap words, so I change to use 'git send-email' in v3. Regards, Chun-Kuang. > > Dave.
Hi, Dave: Dave Airlie <airlied@gmail.com> 於 2020年5月20日 週三 下午1:47寫道： > > On Wed, 20 May 2020 at 15:44, Dave Airlie <airlied@gmail.com> wrote: > > > > On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote: > > > > > > Hi, Dave & Daniel: > > > > > > This include dpi pin mode swap, config mipi_tx current and impedance, > > > and some fixup. I drop drm_bridge patches in this version. > > > > > > 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/chunkuang.hu/linux.git > > > tags/mediatek-drm-next-5.8 > > > for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: > > > > Did you edit this by hand or pass it through some mailserver that > > chewed it up, I had to reconstruct this pull from the above bits, I've > > no idea why it's so messed up in the first place. > > and why does it contain an unexplained backmerge? > > Merge tag 'v5.7-next-drm-stable' of > ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux > into mediatek-drm-next > > Please don't ever backmerge fixes into next pull, without a long > explaination or if you really need it ask us first, > > Please resend this again cleaned up. OK, to make things easier, I just resend and cleaned up. If one day I need a backmerge fixes, I would ask you first. Regards, Chun-Kuang. > > Dave.
On 20/05/2020 07:46, Dave Airlie wrote: > On Wed, 20 May 2020 at 15:44, Dave Airlie <airlied@gmail.com> wrote: >> >> On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote: >>> >>> Hi, Dave & Daniel: >>> >>> This include dpi pin mode swap, config mipi_tx current and impedance, >>> and some fixup. I drop drm_bridge patches in this version. >>> >>> 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/chunkuang.hu/linux.git >>> tags/mediatek-drm-next-5.8 >>> for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: >> >> Did you edit this by hand or pass it through some mailserver that >> chewed it up, I had to reconstruct this pull from the above bits, I've >> no idea why it's so messed up in the first place. > > and why does it contain an unexplained backmerge? > > Merge tag 'v5.7-next-drm-stable' of > ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux > into mediatek-drm-next > > Please don't ever backmerge fixes into next pull, without a long > explaination or if you really need it ask us first, It's not fixes. I suppose my tagging strategy helps to create confusion. The tag is v5.7-*next*, which relates to v5.8 (next version after v5.7). Maybe not the best way to do it. We had to merge a series that changed the drivers/gpu/drm, drivers/soc and drivers/clk. So I took the series through my branch and Chun-Kuang merged a stable tag in his branch so that he can take commits on top of this changes. Maybe the explanation comes too late, but I just wanted to clarify. Regards, Matthias > > Please resend this again cleaned up. > > Dave. > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek >
On Sat, 23 May 2020 at 01:58, Matthias Brugger <matthias.bgg@gmail.com> wrote: > > > > On 20/05/2020 07:46, Dave Airlie wrote: > > On Wed, 20 May 2020 at 15:44, Dave Airlie <airlied@gmail.com> wrote: > >> > >> On Mon, 18 May 2020 at 10:06, Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote: > >>> > >>> Hi, Dave & Daniel: > >>> > >>> This include dpi pin mode swap, config mipi_tx current and impedance, > >>> and some fixup. I drop drm_bridge patches in this version. > >>> > >>> 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/chunkuang.hu/linux.git > >>> tags/mediatek-drm-next-5.8 > >>> for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: > >> > >> Did you edit this by hand or pass it through some mailserver that > >> chewed it up, I had to reconstruct this pull from the above bits, I've > >> no idea why it's so messed up in the first place. > > > > and why does it contain an unexplained backmerge? > > > > Merge tag 'v5.7-next-drm-stable' of > > ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux > > into mediatek-drm-next > > > > Please don't ever backmerge fixes into next pull, without a long > > explaination or if you really need it ask us first, > > It's not fixes. I suppose my tagging strategy helps to create confusion. The tag > is v5.7-*next*, which relates to v5.8 (next version after v5.7). Maybe not the > best way to do it. > > We had to merge a series that changed the drivers/gpu/drm, drivers/soc and > drivers/clk. > So I took the series through my branch and Chun-Kuang merged a stable tag in his > branch so that he can take commits on top of this changes. > > Maybe the explanation comes too late, but I just wanted to clarify. Okay so whenever a submaintainer tree has a merge in it, two things need to happen. a) the merge needs a commit msg explaining what it is, why it's there. b) the subsequent pull request should mention it's existence. I'm not used to pulling trees from submaintainers with merges in them and usually it's a red flag that they've backmerged something they shouldn't have. Dave.
Hi, Dave & Daniel: This include dpi pin mode swap, config mipi_tx current and impedance, and some fixup. I drop drm_bridge patches in this version. 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/chunkuang.hu/linux.git tags/mediatek-drm-next-5.8 for you to fetch changes up to 007d274a017bb4e2ef7b922c2f54f40cf2073664: drm/mediatek: Eliminate the magic number in array size (2020-05-16 17:08:47 +0800) ---------------------------------------------------------------- Mediatek DRM Next for Linux 5.8 ---------------------------------------------------------------- Anand K Mistry (1): drm/mediatek: Stop iterating dma addresses when sg_dma_len() == 0 Bernard Zhao (2): drm/mediatek: Cleanup coding style in mediatek a bit drm/mediatek: Eliminate the magic number in array size Chun-Kuang Hu (1): Merge tag 'v5.7-next-drm-stable' of ssh://gitolite.kernel.org/.../matthias.bgg/linux into mediatek-drm-next Enric Balletbo i Serra (4): 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 drm/mediatek: Remove debug messages for function calls Hsin-Yi Wang (1): drm/mediatek: Fix device passed to cmdq Jitao Shi (6): dt-bindings: display: mediatek: control dpi pins mode to avoid leakage drm/mediatek: set dpi pin mode to gpio low to avoid leakage current dt-bindings: display: mediatek: add property to control mipi tx drive current dt-bindings: display: mediatek: get mipitx calibration data from nvmem drm/mediatek: add the mipitx driving control drm/mediatek: config mipitx impedance with calibration data Matthias Brugger (2): drm/mediatek: Omit warning on probe defers clk / soc: mediatek: Move mt8173 MMSYS to platform driver YueHaibing (1): drm/mediatek: Fix Kconfig warning Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt | 7 +- Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt | 6 + Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt | 10 ++ 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 | 43 +++++- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 27 ++-- 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 | 50 +++---- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 3 + drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 22 ++- drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 54 +++++++ drivers/gpu/drm/mediatek/mtk_mipi_tx.h | 4 + drivers/gpu/drm/mediatek/mtk_mt8183_mipi_tx.c | 28 ++++ 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 +++ 27 files changed, 739 insertions(+), 431 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