diff options
| author |   Dave Airlie <airlied@redhat.com> | 2016-11-11 10:03:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-11 10:09:13 +1000 |
| commit | d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1 (patch) | |
| tree | beafd0e7610f3471432da7bba36ea1375434bc38 /drivers/gpu/drm/Makefile | |
| parent | Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next (diff) | |
| parent | MAINTAINERS: add an entry for ZTE ZX DRM driver (diff) | |
| download | linux-dev-d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1.tar.xz linux-dev-d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1.zip | |
Merge tag 'zxdrm-4.10' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index c1d0602fbe24..f217274754d4 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -87,3 +87,4 @@ obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/ obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/ obj-$(CONFIG_DRM_ARCPGU)+= arc/ obj-y += hisilicon/ +obj-$(CONFIG_DRM_ZTE) += zte/ |