diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-04 19:53:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-04 19:53:15 +1000 |
| commit | 4946dd2e14d252cd04e188ed6a4b794541d1c3ce (patch) | |
| tree | f60cae0676808538becd116090ab6f5f19520edf /drivers/gpu/drm/Kconfig | |
| parent | 090e1a7f5ce139ab4246fcaafaac0415008b7dfa (diff) | |
| parent | c84ffde963e227bf68efb12315bd39c75e00ff05 (diff) | |
Merge tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux into drm-next
drm-hisilicon-next for 4.7
Add new hisilicon kirin drm driver:
- Add maintainer for hisilicon DRM driver
- Add support for external bridge
- Add designware dsi host driver
- Add designware dsi encoder driver
- Add cma fbdev and hotplug
- Add vblank driver for ADE
- Add plane driver for ADE
- Add crtc driver for ADE
- Add hisilicon kirin drm master driver
- Add device tree binding for hi6220 display subsystem
* tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux:
MAINTAINERS: Add maintainer for hisilicon DRM driver
drm/hisilicon: Add support for external bridge
drm/hisilicon: Add designware dsi host driver
drm/hisilicon: Add designware dsi encoder driver
drm/hisilicon: Add cma fbdev and hotplug
drm/hisilicon: Add vblank driver for ADE
drm/hisilicon: Add plane driver for ADE
drm/hisilicon: Add crtc driver for ADE
drm/hisilicon: Add hisilicon kirin drm master driver
drm/hisilicon: Add device tree binding for hi6220 display subsystem
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index cd515029bb49..87f9ab68e8d1 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -285,3 +285,5 @@ source "drivers/gpu/drm/vc4/Kconfig" source "drivers/gpu/drm/etnaviv/Kconfig" source "drivers/gpu/drm/arc/Kconfig" + +source "drivers/gpu/drm/hisilicon/Kconfig" |