Merge tag 'zxdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorDave Airlie <airlied@redhat.com>
Fri, 11 Nov 2016 00:03:15 +0000 (10:03 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 11 Nov 2016 00:09:13 +0000 (10:09 +1000)
commitd8c1abd968f1c880ad8ce4ecf7df55489f8c69a1
treebeafd0e7610f3471432da7bba36ea1375434bc38
parentc765102a2399fd2d47fa3bf8da268431ab913355
parentdbb010376768e0ed657b2be679875d275fd9e8c8
Merge tag 'zxdrm-4.10' of git://git./linux/kernel/git/shawnguo/linux into drm-next

ZTE zxdrm driver support for 4.10:

This is the initial ZTE VOU display controller DRM/KMS driver.  There
are still some features to be added, like overlay plane, scaling, and
more output devices support.  But it's already useful with dual CRTCs
and HDMI display working.

[airlied: use drm_format_plane_cpp instead of legacy api]
* tag 'zxdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  MAINTAINERS: add an entry for ZTE ZX DRM driver
  drm: zte: add initial vou drm driver
  dt-bindings: add bindings doc for ZTE VOU display controller
MAINTAINERS
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile
drivers/gpu/drm/zte/zx_plane.c