• Dave Airlie's avatar
    Merge tag 'sunxi-drm-for-4.13' of... · 7249e3d6
    Dave Airlie authored
    Merge tag 'sunxi-drm-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next
    
    sun4i-drm changes for 4.13
    
    An unusually big pull request for this merge window, with three notable
    features:
      - V3s display engine support. This is especially notable because it uses
        a different display engine used on the newer Allwinner SoCs (H3, A64
        and the likes) that will be quite easily supported now.
      - HDMI support for the old Allwinner SoCs. This is enabled only on the
        A10s for now, but should be really easy to extend to deal with A10, A20
        and A31
      - Preliminary work to deal with dual-pipeline SoCs (A10, A20, A31, H3,
        etc.). It currently ignores the second pipeline, but we can use the
        dual-pipelines bindings. This will be useful to enable the display
        pipeline while we work on the dual-pipeline.
    
    * tag 'sunxi-drm-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (27 commits)
      drm/sun4i: Add compatible for the A10s pipeline
      drm/sun4i: Add HDMI support
      dt-bindings: display: sun4i: Add allwinner,tcon-channel property
      dt-bindings: display: sun4i: Add HDMI display bindings
      drm/sun4i: Ignore the generic connectors for components
      drm/sun4i: tcon: multiply the vtotal when not in interlace
      drm/sun4i: tcon: Change vertical total size computation inconsistency
      drm/sun4i: tcon: Fix tcon channel 1 backporch calculation
      drm/sun4i: tcon: Switch mux on only for composite
      drm/sun4i: tcon: Move the muxing out of the mode set function
      drm/sun4i: tcon: Add channel debug
      drm/sun4i: tcon: add support for V3s TCON
      drm/sun4i: Add compatible string for V3s display engine
      drm/sun4i: add support for Allwinner DE2 mixers
      drm/sun4i: add a Kconfig option for sun4i-backend
      drm/sun4i: abstract a engine type
      drm/sun4i: return only planes for layers created
      dt-bindings: add bindings for DE2 on V3s SoC
      drm/sun4i: backend: Clarify sun4i_backend_layer_enable debug message
      drm/sun4i: Set TCON clock inside sun4i_tconX_mode_set
      ...
    7249e3d6
sun4i_drv.c 8.34 KB