Merge tag 'drm-vc4-next-2015-10-21' of http://github.com/anholt/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 22 Oct 2015 00:23:31 +0000 (10:23 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Oct 2015 00:31:17 +0000 (10:31 +1000)
commit1f43710a8e3d0de5dcbf14d3d8a0b5f31126396f
tree2cb7a32e46f3aac11f16fb0144adf150134d7ca6
parentaffa0e033b04996700434312c76df3c78f683870
parent98a44504541c6befb28366eb9ec432ba44070dd9
Merge tag 'drm-vc4-next-2015-10-21' of github.com/anholt/linux into drm-next

This pull request introduces the vc4 driver, for kernel modesetting on
the Raspberry Pi (bcm2835/bcm2836 architectures).  It currently
supports a display plane and cursor on the HDMI output.  The driver
doesn't do 3D, power management, or overlay planes yet.

[airlied: fixup the enable/disable vblank APIs]

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
* tag 'drm-vc4-next-2015-10-21' of http://github.com/anholt/linux:
  drm/vc4: Allow vblank to be disabled
  drm/vc4: Use the fbdev_cma helpers
  drm/vc4: Add KMS support for Raspberry Pi.
  drm/vc4: Add devicetree bindings for VC4.
drivers/gpu/drm/Makefile
drivers/gpu/drm/vc4/vc4_crtc.c
drivers/gpu/drm/vc4/vc4_drv.h