diff options
author | Dave Airlie <airlied@redhat.com> | 2016-06-01 23:50:23 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-06-01 23:50:23 +0200 |
commit | 65439b68bb10afd877af05463bbff5d25200fd06 (patch) | |
tree | 846aeadab033ec39a3ed942c82976b40ea4994a2 /MAINTAINERS | |
parent | Linux 4.7-rc1 (diff) | |
parent | drm/vc4: Use lockless gem BO free callback (diff) | |
download | linux-65439b68bb10afd877af05463bbff5d25200fd06.tar.xz linux-65439b68bb10afd877af05463bbff5d25200fd06.zip |
Merge tag 'topic/drm-misc-2016-06-01' of git://anongit.freedesktop.org/drm-intel into drm-next
Frist -misc pull for 4.8, with pretty much just random all over plus a few
more lockless gem BO patches acked/reviewed by driver maintainers.
I'm starting a bit earlier this time around because there's a few invasive
patch series to land (nonblocking atomic prep work, fence prep work,
rst/sphinx kerneldoc finally happening) and I need a baseline with all the
branches merged.
* tag 'topic/drm-misc-2016-06-01' of git://anongit.freedesktop.org/drm-intel: (21 commits)
drm/vc4: Use lockless gem BO free callback
drm/vc4: Use drm_gem_object_unreference_unlocked
drm: Initialize a linear gamma table by default
drm/vgem: Use lockless gem BO free callback
drm/qxl: Don't set a gamma table size
drm/msm: Nuke dummy gamma_set/get functions
drm/cirrus: Drop redundnant gamma size check
drm/fb-helper: Remove dead code in setcolreg
drm/mediatek: Use lockless gem BO free callback
drm/hisilicon: Use lockless gem BO free callback
drm/hlcd: Use lockless gem BO free callback
vga_switcheroo: Support deferred probing of audio clients
vga_switcheroo: Add helper for deferred probing
virtio-gpu: fix output lookup
drm/doc: Unify KMS Locking docs
drm/atomic-helper: Do not call ->mode_fixup for CRTC which will be disabled
Fix annoyingly awkward typo in drm_edid_load.c
drm/doc: Drop vblank_disable_allow wording
drm: use seqlock for vblank time/count
drm/mm: avoid possible null pointer dereference
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7304d2e37a98..150d52cb983c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3854,6 +3854,9 @@ T: git git://people.freedesktop.org/~airlied/linux S: Maintained F: drivers/gpu/drm/ F: drivers/gpu/vga/ +F: Documentation/devicetree/bindings/display/ +F: Documentation/devicetree/bindings/gpu/ +F: Documentation/devicetree/bindings/video/ F: Documentation/DocBook/gpu.* F: include/drm/ F: include/uapi/drm/ |