summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2019-02-01 09:51:23 +1000
committerDave Airlie <airlied@redhat.com>2019-02-01 10:01:50 +1000
commit74b7d6a91311766ab6c94f6be21bd423021ca95e (patch)
tree7b4540d08d37894033bc148d87e0e6cca3a6002b /MAINTAINERS
parentfb27a3cb9cbfedaa914c04bbae45861646d397b6 (diff)
parentdcc9d76b6d834d06a317e27fa8242d7e009135ac (diff)
downloadlinux-74b7d6a91311766ab6c94f6be21bd423021ca95e.tar.gz
linux-74b7d6a91311766ab6c94f6be21bd423021ca95e.tar.bz2
linux-74b7d6a91311766ab6c94f6be21bd423021ca95e.zip
Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
This pull includes the new Arm "komeda" DRM driver. It is currently hosted in the same repo as the other "mali-dp" driver because it is the next iteration of the IP. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Liviu Dudau <Liviu.Dudau@arm.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190131173600.GN25147@e110455-lin.cambridge.arm.com
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS15
1 files changed, 14 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6e1cef2f21d9..4b752571fe03 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1133,13 +1133,26 @@ S: Supported
F: drivers/gpu/drm/arm/hdlcd_*
F: Documentation/devicetree/bindings/display/arm,hdlcd.txt
+ARM KOMEDA DRM-KMS DRIVER
+M: James (Qian) Wang <james.qian.wang@arm.com>
+M: Liviu Dudau <liviu.dudau@arm.com>
+L: Mali DP Maintainers <malidp@foss.arm.com>
+S: Supported
+T: git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
+F: drivers/gpu/drm/arm/display/include/
+F: drivers/gpu/drm/arm/display/komeda/
+F: Documentation/devicetree/bindings/display/arm/arm,komeda.txt
+F: Documentation/gpu/komeda-kms.rst
+
ARM MALI-DP DRM DRIVER
M: Liviu Dudau <liviu.dudau@arm.com>
M: Brian Starkey <brian.starkey@arm.com>
-M: Mali DP Maintainers <malidp@foss.arm.com>
+L: Mali DP Maintainers <malidp@foss.arm.com>
S: Supported
+T: git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
F: drivers/gpu/drm/arm/
F: Documentation/devicetree/bindings/display/arm,malidp.txt
+F: Documentation/gpu/afbc.rst
ARM MFM AND FLOPPY DRIVERS
M: Ian Molton <spyro@f2s.com>