[PATCH v3 00/11] drm/meson: Initial support for HDMI Output
Neil Armstrong
narmstrong at baylibre.com
Tue Apr 4 15:55:51 UTC 2017
On 04/04/2017 02:15 PM, Neil Armstrong wrote:
> The Amlogic GX SoCs implements a Synopsys DesignWare HDMI TX Controller
> in combination with a very custom PHY.
>
> This patchset depends on Laurent Pinchart patchset merged in drm-misc-next
> and my v6 patchset at [1] to permit PHY control from outside the dw-hdmi driver.
>
> The Synopsys DesignWare HDMI TX Controller is integrated like :
> ___________________________________
> | HDMI TOP |<= HPD
> |___________________________________|
> | | |
> HDMI-TX-| Synopsys HDMI | HDMI PHY |=> TMDS
> | Controller |________________|
> |___________________________________|<=> DDC
>
> And uses the following paths for Pixels Encoding :
> _____ _____ ____________________
> vd1---| |-| | | VENC /---------|----VDAC
> vd2---| VIU |-| VPP |-|-----ENCI/-ENCI_DVI-|\
> osd1--| |-| | | \ | X--HDMI-TX
> osd2--|_____|-|_____| | |\-ENCP--ENCP_DVI-|/
> | | |
> | \--ENCL-----------|----LVDS
> |____________________|
>
> The ENCI and ENCP encoders pre-formats the data for the ENCI-DVI and
> ENCP-DVI encoders. Those DVI encoders will format the pixels for the
> Synopsys DesignWare HDMI TX Controller.
>
> In order to support display modes, the ENCI and ENCP encoders needs very
> specific parameters for *each* display modes, so usage of the CEA VIC
> identifier is necessary. But the DVI timings are generated from the
> drm_mode structure in a generic way.
>
> To simplify the first push, only the main CEA modes are supported up to
> 1920x1080p60. Supporting the 480i and 576i needs tweaking in the dw-hdmi
> in order to support the Clock Doubling necessary for these modes.
>
> Support for more traditional modes like the EDID fallback modes is planned
> but will need tome additionnal handling along the CEA modes.
> Support for 4k2k modes needs to be able to get the EDID HDMI modes, but
> for now only the HDMI 1.4 modes are currently available in the drm_edid
> implementation.
>
> This patchset does :
> - Fixes the CRTC handling
> - Fixes the registers definitions
> - Adds support for device components registration along of-graph
> - Adds support for HDMI clocks
> - Adds support for HDMI VENC video modes
> - Adds support for the Custom HDMI PHY using callbacks added in [1]
> - Adds CMA node to reserve enougth memory for 1080p display
> - Adds the HDMI controller et connector modes on selected boards
> - Adds a proper dt-bindings for the HDMI controller et connector
> - Add RST documentation for Meson DRM driver
> - Updates the MAINTAINERS file to track the new files
>
> Changes since v2 patchset at [4] :
> - Dropped already merged DT patches
> - Added Daniel Vetter's acks
> - Rebased on drm-misc-next at 9c4ad466d1dd
>
> Changes since v1 patchset at [2] :
> - Add the meson drm documentation from [3] to this patchset
> - Update with new bus formats and HPD callbacks
> - Drop all the of_machine_is_compatible
>
> [1] http://lkml.kernel.org/r/1491230558-10804-1-git-send-email-narmstrong@baylibre.com
> [2] http://lkml.kernel.org/r/1488469207-523-1-git-send-email-narmstrong@baylibre.com
> [3] http://lkml.kernel.org/r/1488536068-9407-1-git-send-email-narmstrong@baylibre.com
> [4] http://lkml.kernel.org/r/1490109950-21421-1-git-send-email-narmstrong@baylibre.com
>
> Neil Armstrong (11):
> drm/meson: Use crtc_state for hdisplay and fix atomic flush/enable
> sync for vsync commit
> drm/meson: Add missing HDMI register
> drm/meson: Add support for components
> drm/meson: venc_cvbs: no more return -ENODEV if CVBS is not available
> drm/meson: add support for HDMI clock support
> drm/meson: Add support for HDMI venc modes and settings
> drm/meson: Add support for HDMI encoder and DW-HDMI bridge + PHY
> dt-bindings: Add bindings for the Amlogic Meson dw-hdmi extension
> drm/meson: Convert existing documentation to actual kerneldoc
> drm/meson: Add RST to bring together kerneldoc
> MAINTAINERS: update files for Amlogic DRM Driver
>
> .../bindings/display/amlogic,meson-dw-hdmi.txt | 111 ++
> Documentation/gpu/index.rst | 1 +
> Documentation/gpu/meson.rst | 61 +
> MAINTAINERS | 2 +
> drivers/gpu/drm/meson/Kconfig | 6 +
> drivers/gpu/drm/meson/Makefile | 1 +
> drivers/gpu/drm/meson/meson_canvas.c | 4 +-
> drivers/gpu/drm/meson/meson_crtc.c | 15 +-
> drivers/gpu/drm/meson/meson_drv.c | 118 +-
> drivers/gpu/drm/meson/meson_drv.h | 3 +
> drivers/gpu/drm/meson/meson_dw_hdmi.c | 919 ++++++++++++++
> drivers/gpu/drm/meson/meson_dw_hdmi.h | 146 +++
> drivers/gpu/drm/meson/meson_registers.h | 1 +
> drivers/gpu/drm/meson/meson_vclk.c | 632 +++++++++-
> drivers/gpu/drm/meson/meson_vclk.h | 6 +-
> drivers/gpu/drm/meson/meson_venc.c | 1254 +++++++++++++++++++-
> drivers/gpu/drm/meson/meson_venc.h | 7 +
> drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +-
> drivers/gpu/drm/meson/meson_viu.c | 6 +-
> drivers/gpu/drm/meson/meson_vpp.c | 8 +-
> drivers/gpu/drm/meson/meson_vpp.h | 2 +
> 21 files changed, 3267 insertions(+), 47 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> create mode 100644 Documentation/gpu/meson.rst
> create mode 100644 drivers/gpu/drm/meson/meson_dw_hdmi.c
> create mode 100644 drivers/gpu/drm/meson/meson_dw_hdmi.h
>
Applied to drm-misc-next
Thanks Daniel, Sean,
Neil
More information about the dri-devel
mailing list