Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
regards Philipp
The following changes since commit 9735a22799b9214d17d3c231fe377fc852f042e9:
Linux 4.6-rc2 (2016-04-03 09:09:40 -0500)
are available in the git repository at:
git://git.pengutronix.de/git/pza/linux.git tags/mediatek-drm-2016-04-19
for you to fetch changes up to e34ba70de8c46a460328a362eece4db6e9b63ec7:
arm64: dts: mt8173: Add display subsystem related nodes (2016-04-19 14:54:42 +0200)
---------------------------------------------------------------- MT8173 DRM support
- device tree bindings for all MT8173 display subsystem components - basic mediatek drm driver for MT8173 with two optional, currently fixed output paths: - DSI encoder support for DSI and (via bridge) eDP panels - DPI encoder support for output to HDMI bridge - necessary clock tree changes for the DPI->HDMI path
---------------------------------------------------------------- CK Hu (4): dt-bindings: drm/mediatek: Add Mediatek display subsystem dts binding drm/mediatek: Add DRM Driver for Mediatek SoC MT8173. drm/mediatek: Add DSI sub driver arm64: dts: mt8173: Add display subsystem related nodes
Jie Qiu (1): drm/mediatek: Add DPI sub driver
Philipp Zabel (3): clk: mediatek: make dpi0_sel propagate rate changes clk: mediatek: Add hdmi_ref HDMI PHY PLL reference clock output clk: mediatek: remove hdmitx_dig_cts from TOP clocks
.../bindings/display/mediatek/mediatek,disp.txt | 203 +++++ .../bindings/display/mediatek/mediatek,dpi.txt | 35 + .../bindings/display/mediatek/mediatek,dsi.txt | 60 ++ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 223 +++++ drivers/clk/mediatek/clk-mt8173.c | 12 +- drivers/clk/mediatek/clk-mtk.h | 15 +- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/mediatek/Kconfig | 14 + drivers/gpu/drm/mediatek/Makefile | 14 + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 302 +++++++ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_dpi.c | 769 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 228 +++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 582 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 32 + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 355 ++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 41 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 225 +++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 150 ++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 567 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 165 ++++ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 23 + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 269 ++++++ drivers/gpu/drm/mediatek/mtk_drm_gem.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 59 ++ drivers/gpu/drm/mediatek/mtk_dsi.c | 927 +++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 463 ++++++++++ include/dt-bindings/clock/mt8173-clk.h | 3 +- 31 files changed, 6332 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt create mode 100644 drivers/gpu/drm/mediatek/Kconfig create mode 100644 drivers/gpu/drm/mediatek/Makefile create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl.c create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi_regs.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.h create mode 100644 drivers/gpu/drm/mediatek/mtk_dsi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.c
On 19/04/16 15:42, Philipp Zabel wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Please don't pull e34ba70de8c4 ("arm64: dts: mt8173: Add display subsystem related nodes") If you pull the rest, this patch will go through my branch.
Regards, Matthias
regards Philipp
The following changes since commit 9735a22799b9214d17d3c231fe377fc852f042e9:
Linux 4.6-rc2 (2016-04-03 09:09:40 -0500)
are available in the git repository at:
git://git.pengutronix.de/git/pza/linux.git tags/mediatek-drm-2016-04-19
for you to fetch changes up to e34ba70de8c46a460328a362eece4db6e9b63ec7:
arm64: dts: mt8173: Add display subsystem related nodes (2016-04-19 14:54:42 +0200)
MT8173 DRM support
- device tree bindings for all MT8173 display subsystem components
- basic mediatek drm driver for MT8173 with two optional, currently fixed output paths:
- DSI encoder support for DSI and (via bridge) eDP panels
- DPI encoder support for output to HDMI bridge
- necessary clock tree changes for the DPI->HDMI path
CK Hu (4): dt-bindings: drm/mediatek: Add Mediatek display subsystem dts binding drm/mediatek: Add DRM Driver for Mediatek SoC MT8173. drm/mediatek: Add DSI sub driver arm64: dts: mt8173: Add display subsystem related nodes
Jie Qiu (1): drm/mediatek: Add DPI sub driver
Philipp Zabel (3): clk: mediatek: make dpi0_sel propagate rate changes clk: mediatek: Add hdmi_ref HDMI PHY PLL reference clock output clk: mediatek: remove hdmitx_dig_cts from TOP clocks
.../bindings/display/mediatek/mediatek,disp.txt | 203 +++++ .../bindings/display/mediatek/mediatek,dpi.txt | 35 + .../bindings/display/mediatek/mediatek,dsi.txt | 60 ++ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 223 +++++ drivers/clk/mediatek/clk-mt8173.c | 12 +- drivers/clk/mediatek/clk-mtk.h | 15 +- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/mediatek/Kconfig | 14 + drivers/gpu/drm/mediatek/Makefile | 14 + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 302 +++++++ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_dpi.c | 769 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 228 +++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 582 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 32 + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 355 ++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 41 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 225 +++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 150 ++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 567 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 165 ++++ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 23 + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 269 ++++++ drivers/gpu/drm/mediatek/mtk_drm_gem.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 59 ++ drivers/gpu/drm/mediatek/mtk_dsi.c | 927 +++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 463 ++++++++++ include/dt-bindings/clock/mt8173-clk.h | 3 +- 31 files changed, 6332 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt create mode 100644 drivers/gpu/drm/mediatek/Kconfig create mode 100644 drivers/gpu/drm/mediatek/Makefile create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl.c create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi_regs.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.h create mode 100644 drivers/gpu/drm/mediatek/mtk_dsi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.c
On Wed, Apr 20, 2016 at 03:36:16PM +0200, Matthias Brugger wrote:
On 19/04/16 15:42, Philipp Zabel wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Please don't pull e34ba70de8c4 ("arm64: dts: mt8173: Add display subsystem related nodes") If you pull the rest, this patch will go through my branch.
So not on top of this at all, but do we have to split up arm drm drivers so much? Generally this stuff goes in through one tree with the driver, with acks from other subsystem as needed. That ack seems to be missing, but imo better to supply it and just get this pull req through. Or double merge a patch, we do that fairly often.
Anyway just a comment, but sitting outside watching I think arm has a pretty serious problem with tree proliferation. And it's not helping to get fairly simple drivers like this one merged ...
Cheers, Daniel
Regards, Matthias
regards Philipp
The following changes since commit 9735a22799b9214d17d3c231fe377fc852f042e9:
Linux 4.6-rc2 (2016-04-03 09:09:40 -0500)
are available in the git repository at:
git://git.pengutronix.de/git/pza/linux.git tags/mediatek-drm-2016-04-19
for you to fetch changes up to e34ba70de8c46a460328a362eece4db6e9b63ec7:
arm64: dts: mt8173: Add display subsystem related nodes (2016-04-19 14:54:42 +0200)
MT8173 DRM support
- device tree bindings for all MT8173 display subsystem components
- basic mediatek drm driver for MT8173 with two optional, currently fixed output paths:
- DSI encoder support for DSI and (via bridge) eDP panels
- DPI encoder support for output to HDMI bridge
- necessary clock tree changes for the DPI->HDMI path
CK Hu (4): dt-bindings: drm/mediatek: Add Mediatek display subsystem dts binding drm/mediatek: Add DRM Driver for Mediatek SoC MT8173. drm/mediatek: Add DSI sub driver arm64: dts: mt8173: Add display subsystem related nodes
Jie Qiu (1): drm/mediatek: Add DPI sub driver
Philipp Zabel (3): clk: mediatek: make dpi0_sel propagate rate changes clk: mediatek: Add hdmi_ref HDMI PHY PLL reference clock output clk: mediatek: remove hdmitx_dig_cts from TOP clocks
.../bindings/display/mediatek/mediatek,disp.txt | 203 +++++ .../bindings/display/mediatek/mediatek,dpi.txt | 35 + .../bindings/display/mediatek/mediatek,dsi.txt | 60 ++ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 223 +++++ drivers/clk/mediatek/clk-mt8173.c | 12 +- drivers/clk/mediatek/clk-mtk.h | 15 +- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/mediatek/Kconfig | 14 + drivers/gpu/drm/mediatek/Makefile | 14 + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 302 +++++++ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_dpi.c | 769 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 228 +++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 582 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 32 + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 355 ++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 41 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 225 +++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 150 ++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 567 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 165 ++++ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 23 + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 269 ++++++ drivers/gpu/drm/mediatek/mtk_drm_gem.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 59 ++ drivers/gpu/drm/mediatek/mtk_dsi.c | 927 +++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 463 ++++++++++ include/dt-bindings/clock/mt8173-clk.h | 3 +- 31 files changed, 6332 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt create mode 100644 drivers/gpu/drm/mediatek/Kconfig create mode 100644 drivers/gpu/drm/mediatek/Makefile create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl.c create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi_regs.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.h create mode 100644 drivers/gpu/drm/mediatek/mtk_dsi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.c
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
On 20/04/16 17:19, Daniel Vetter wrote:
On Wed, Apr 20, 2016 at 03:36:16PM +0200, Matthias Brugger wrote:
On 19/04/16 15:42, Philipp Zabel wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Please don't pull e34ba70de8c4 ("arm64: dts: mt8173: Add display subsystem related nodes") If you pull the rest, this patch will go through my branch.
So not on top of this at all, but do we have to split up arm drm drivers so much? Generally this stuff goes in through one tree with the driver, with acks from other subsystem as needed. That ack seems to be missing, but imo better to supply it and just get this pull req through. Or double merge a patch, we do that fairly often.
Anyway just a comment, but sitting outside watching I think arm has a pretty serious problem with tree proliferation. And it's not helping to get fairly simple drivers like this one merged ...
Device tree (DTS) patches are not really part of the driver. They are part of the SoC/board that has the device. DTS describes the hardware that is on the SoC/board.
AFAIK the idea behind splitting that from the rest of the drivers is to make the merging easier. If every driver repository has it's own DTS entries, then when merging all this repositories into master, you will get a merge error in the DTS part on every driver repository. Which most probably will drive the maintainer insane.
If instead you have the DTS bits in the arm-soc repository, you can easily merge the rest of the drivers.
Regards, Matthias
Cheers, Daniel
Regards, Matthias
regards Philipp
The following changes since commit 9735a22799b9214d17d3c231fe377fc852f042e9:
Linux 4.6-rc2 (2016-04-03 09:09:40 -0500)
are available in the git repository at:
git://git.pengutronix.de/git/pza/linux.git tags/mediatek-drm-2016-04-19
for you to fetch changes up to e34ba70de8c46a460328a362eece4db6e9b63ec7:
arm64: dts: mt8173: Add display subsystem related nodes (2016-04-19 14:54:42 +0200)
MT8173 DRM support
- device tree bindings for all MT8173 display subsystem components
- basic mediatek drm driver for MT8173 with two optional, currently fixed output paths:
- DSI encoder support for DSI and (via bridge) eDP panels
- DPI encoder support for output to HDMI bridge
- necessary clock tree changes for the DPI->HDMI path
CK Hu (4): dt-bindings: drm/mediatek: Add Mediatek display subsystem dts binding drm/mediatek: Add DRM Driver for Mediatek SoC MT8173. drm/mediatek: Add DSI sub driver arm64: dts: mt8173: Add display subsystem related nodes
Jie Qiu (1): drm/mediatek: Add DPI sub driver
Philipp Zabel (3): clk: mediatek: make dpi0_sel propagate rate changes clk: mediatek: Add hdmi_ref HDMI PHY PLL reference clock output clk: mediatek: remove hdmitx_dig_cts from TOP clocks
.../bindings/display/mediatek/mediatek,disp.txt | 203 +++++ .../bindings/display/mediatek/mediatek,dpi.txt | 35 + .../bindings/display/mediatek/mediatek,dsi.txt | 60 ++ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 223 +++++ drivers/clk/mediatek/clk-mt8173.c | 12 +- drivers/clk/mediatek/clk-mtk.h | 15 +- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/mediatek/Kconfig | 14 + drivers/gpu/drm/mediatek/Makefile | 14 + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 302 +++++++ drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_dpi.c | 769 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 228 +++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 582 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 32 + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 355 ++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 41 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 225 +++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 150 ++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 567 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_fb.c | 165 ++++ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 23 + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 269 ++++++ drivers/gpu/drm/mediatek/mtk_drm_gem.h | 59 ++ drivers/gpu/drm/mediatek/mtk_drm_plane.c | 240 ++++++ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 59 ++ drivers/gpu/drm/mediatek/mtk_dsi.c | 927 +++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 463 ++++++++++ include/dt-bindings/clock/mt8173-clk.h | 3 +- 31 files changed, 6332 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt create mode 100644 drivers/gpu/drm/mediatek/Kconfig create mode 100644 drivers/gpu/drm/mediatek/Makefile create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl.c create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi_regs.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.c create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.h create mode 100644 drivers/gpu/drm/mediatek/mtk_dsi.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.c
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter daniel@ffwll.ch writes:
On Wed, Apr 20, 2016 at 03:36:16PM +0200, Matthias Brugger wrote:
On 19/04/16 15:42, Philipp Zabel wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Please don't pull e34ba70de8c4 ("arm64: dts: mt8173: Add display subsystem related nodes") If you pull the rest, this patch will go through my branch.
So not on top of this at all, but do we have to split up arm drm drivers so much? Generally this stuff goes in through one tree with the driver, with acks from other subsystem as needed. That ack seems to be missing, but imo better to supply it and just get this pull req through. Or double merge a patch, we do that fairly often.
Anyway just a comment, but sitting outside watching I think arm has a pretty serious problem with tree proliferation. And it's not helping to get fairly simple drivers like this one merged ...
DT changes do get merged through the arm DT tree separately. ARM has absurd tree proliferation, but I think in this case it actually makes sense. DT is the most common place I have merge conflicts when working on platform enabling across the steaming piles of subsystem trees out there, and keeping DT separate means that a merged -next tree can be built sanely.
On Wed, Apr 20, 2016 at 09:21:17AM -0700, Eric Anholt wrote:
Daniel Vetter daniel@ffwll.ch writes:
On Wed, Apr 20, 2016 at 03:36:16PM +0200, Matthias Brugger wrote:
On 19/04/16 15:42, Philipp Zabel wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Please don't pull e34ba70de8c4 ("arm64: dts: mt8173: Add display subsystem related nodes") If you pull the rest, this patch will go through my branch.
So not on top of this at all, but do we have to split up arm drm drivers so much? Generally this stuff goes in through one tree with the driver, with acks from other subsystem as needed. That ack seems to be missing, but imo better to supply it and just get this pull req through. Or double merge a patch, we do that fairly often.
Anyway just a comment, but sitting outside watching I think arm has a pretty serious problem with tree proliferation. And it's not helping to get fairly simple drivers like this one merged ...
DT changes do get merged through the arm DT tree separately. ARM has absurd tree proliferation, but I think in this case it actually makes sense. DT is the most common place I have merge conflicts when working on platform enabling across the steaming piles of subsystem trees out there, and keeping DT separate means that a merged -next tree can be built sanely.
Ok, makes sense. Still I guess just double-merging in this case would be the simplest option. Git should be clever enough in general to realize what's going on. -Daniel
On Wed, Apr 20, 2016 at 7:32 PM, Daniel Vetter daniel@ffwll.ch wrote:
On Wed, Apr 20, 2016 at 09:21:17AM -0700, Eric Anholt wrote:
Daniel Vetter daniel@ffwll.ch writes:
On Wed, Apr 20, 2016 at 03:36:16PM +0200, Matthias Brugger wrote:
On 19/04/16 15:42, Philipp Zabel wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Please don't pull e34ba70de8c4 ("arm64: dts: mt8173: Add display subsystem related nodes") If you pull the rest, this patch will go through my branch.
So not on top of this at all, but do we have to split up arm drm drivers so much? Generally this stuff goes in through one tree with the driver, with acks from other subsystem as needed. That ack seems to be missing, but imo better to supply it and just get this pull req through. Or double merge a patch, we do that fairly often.
Anyway just a comment, but sitting outside watching I think arm has a pretty serious problem with tree proliferation. And it's not helping to get fairly simple drivers like this one merged ...
DT changes do get merged through the arm DT tree separately. ARM has absurd tree proliferation, but I think in this case it actually makes sense. DT is the most common place I have merge conflicts when working on platform enabling across the steaming piles of subsystem trees out there, and keeping DT separate means that a merged -next tree can be built sanely.
Ok, makes sense. Still I guess just double-merging in this case would be the simplest option. Git should be clever enough in general to realize what's going on. -Daniel
I have added a new tag without commit e34ba70de8c4 (at mediatek-drm-2016-04-19^1): git://git.pengutronix.de/git/pza/linux.git tags/mediatek-drm-2016-04-20 to pull instead.
regards Philipp
On 19 April 2016 at 23:42, Philipp Zabel p.zabel@pengutronix.de wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Close but no cigar,
building as a module screws up here,
drivers/gpu/drm/mediatek/mtk_drm_drv.o: In function `init_module': mtk_drm_drv.c:(.init.text+0x0): multiple definition of `init_module' drivers/gpu/drm/mediatek/mtk_drm_ddp.o:mtk_drm_ddp.c:(.init.text+0x0): first defined here drivers/gpu/drm/mediatek/mtk_drm_drv.o: In function `cleanup_module': mtk_drm_drv.c:(.exit.text+0x0): multiple definition of `cleanup_module' drivers/gpu/drm/mediatek/mtk_drm_ddp.o:mtk_drm_ddp.c:(.exit.text+0x0): first defined here
Try again! (or tell me I pulled the wrong thing :-)
Dave.
Am Freitag, den 22.04.2016, 05:50 +1000 schrieb Dave Airlie:
On 19 April 2016 at 23:42, Philipp Zabel p.zabel@pengutronix.de wrote:
Hi Dave,
please consider pulling this tag with initial MediaTek MT8173 DRM support, corresponding to v14 of the patch series. These patches have been mostly stable for the last few rounds. I'll follow up with the HDMI encoder support pending review of the latest version.
Close but no cigar,
building as a module screws up here,
Turns out I haven't tested modular build for a while. At some point I've mistakenly synced from the chromeos config and never noticed. I've fixed my build script to check for this.
drivers/gpu/drm/mediatek/mtk_drm_drv.o: In function `init_module': mtk_drm_drv.c:(.init.text+0x0): multiple definition of `init_module' drivers/gpu/drm/mediatek/mtk_drm_ddp.o:mtk_drm_ddp.c:(.init.text+0x0): first defined here drivers/gpu/drm/mediatek/mtk_drm_drv.o: In function `cleanup_module': mtk_drm_drv.c:(.exit.text+0x0): multiple definition of `cleanup_module' drivers/gpu/drm/mediatek/mtk_drm_ddp.o:mtk_drm_ddp.c:(.exit.text+0x0): first defined here
Try again! (or tell me I pulled the wrong thing :-)
Try again it is.
The mediatek-drm/next branch has the fix now, built as a module and tested. I'll tag this and resend a pull request later today.
regards Philipp
dri-devel@lists.freedesktop.org
-
Daniel Vetter -
Dave Airlie -
Eric Anholt -
Matthias Brugger -
Philipp Zabel -
Philipp Zabel