Merge tag 'drm-vc4-next-2016-12-09' of https://github.com/anholt/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 13 Dec 2016 02:05:12 +0000 (12:05 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 13 Dec 2016 02:05:12 +0000 (12:05 +1000)
This pull request brings in VEC (TV-out) support for vc4, along with a
pageflipping race fix.

* tag 'drm-vc4-next-2016-12-09' of https://github.com/anholt/linux:
  drm/vc4: Don't use drm_put_dev
  drm/vc4: Document VEC DT binding
  drm/vc4: Add support for the VEC (Video Encoder) IP
  drm: Add TV connector states to drm_connector_state
  drm: Turn DRM_MODE_SUBCONNECTOR_xx definitions into an enum
  drm/vc4: Fix ->clock_select setting for the VEC encoder
  drm/vc4: Fix race between page flip completion event and clean-up

1  2 
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/vc4/vc4_drv.c
drivers/gpu/drm/vc4/vc4_kms.c
include/drm/drm_connector.h
include/uapi/drm/drm_mode.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge