Merge tag 'drm-vc4-next-2016-05-02' of https://github.com/anholt/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 4 May 2016 07:30:53 +0000 (17:30 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 May 2016 07:30:53 +0000 (17:30 +1000)
commitacff058f8625022bbc37a3521f8208810a42c4ef
tree952483ff261d4ff68b4c21709f536252ef74f038
parent2b8f01f178fdae58372f4a0d4bc45f3e5b43fe2d
parent0cd3e27476620176c19e346f82576c6e139b85a9
Merge tag 'drm-vc4-next-2016-05-02' of https://github.com/anholt/linux into drm-next

This pull request brings in DPI panel support, gamma ramp support, and
render nodes for vc4.

* tag 'drm-vc4-next-2016-05-02' of https://github.com/anholt/linux:
  drm/vc4: Add missing render node support
  drm/vc4: Add support for gamma ramps.
  drm/vc4: Fix NULL deref in HDMI init error path
  drm/vc4: Add DPI driver
  drm: Add an encoder and connector type enum for DPI.
drivers/gpu/drm/drm_crtc.c
include/uapi/drm/drm_mode.h