diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-02-01 08:26:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-01 08:29:04 +1000 |
| commit | 3a5e6bb9c660173cf6a1a3f29b0501553cd4db2f (patch) | |
| tree | a9b28f2391cc11fb4a3f50e261b870f50c53a6f8 /drivers/gpu/drm/zte/zx_drm_drv.h | |
| parent | Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/git/drm-intel into drm-next (diff) | |
| parent | drm: zte: add tvenc driver support (diff) | |
| download | linux-dev-3a5e6bb9c660173cf6a1a3f29b0501553cd4db2f.tar.xz linux-dev-3a5e6bb9c660173cf6a1a3f29b0501553cd4db2f.zip | |
Merge tag 'zxdrm-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into drm-next
ZTE DRM driver updates for 4.11:
- Add missing selection of VIDEOMODE_HELPERS in Kconfig, since ZTE DRM
driver uses drm_display_mode_to_videomode().
- Enable HDMI audio support through SPDIF interface based on generic
hdmi-audio-codec driver.
- Enable VOU VL (Video Layer) to support overlay plane with scaling
function.
- Refine zx_vou driver a bit and then add TV Encoder output device
support.
[airlied: fixup plane format change]
* tag 'zxdrm-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
drm: zte: add tvenc driver support
dt: add bindings for ZTE tvenc device
drm: zte: add function to configure vou_ctrl dividers
drm: zte: move struct vou_inf into zx_vou driver
drm: zte: add interlace mode support
drm: zte: add overlay plane support
drm: zte: add .atomic_disable hook to disable graphic layer
drm: zte: make zx_plane accessible from zx_vou driver
drm: zte: support hdmi audio through spdif
drm: zte: select VIDEOMODE_HELPERS in Kconfig
Diffstat (limited to 'drivers/gpu/drm/zte/zx_drm_drv.h')
| -rw-r--r-- | drivers/gpu/drm/zte/zx_drm_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/zte/zx_drm_drv.h b/drivers/gpu/drm/zte/zx_drm_drv.h index e65cd18a6cba..5ca035b079c7 100644 --- a/drivers/gpu/drm/zte/zx_drm_drv.h +++ b/drivers/gpu/drm/zte/zx_drm_drv.h @@ -13,6 +13,7 @@ extern struct platform_driver zx_crtc_driver; extern struct platform_driver zx_hdmi_driver; +extern struct platform_driver zx_tvenc_driver; static inline u32 zx_readl(void __iomem *reg) { |