diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-03 16:30:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-03 16:30:24 +1000 |
| commit | 320d8c3d38739fa8e31a076b86cbdafcf8897d5e (patch) | |
| tree | ac43e4981ad56b9612cd0cfc0e075401da38f89f /MAINTAINERS | |
| parent | 7558ab66424e61819cbf3d778d9f780f3aa205e9 (diff) | |
| parent | b121b051d14cc6e4e799e96e9c06c55989f9e073 (diff) | |
Merge tag 'drm-misc-next-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc into drm-next
drm-misc for 4.12:
Core:
- Removed some fb subsampling dimension checks from core (Ville)
- Some MST slot cleanup (Dhinakaran)
- Extracted drm_debugfs.h & drm_ioctl.h from drmP.h (Daniel)
- Added drm_atomic_helper_shutdown() to compliment suspend/resume counterparts
(Daniel)
- Pipe context through legacy modeset to remove legacy_backoff nasties (Daniel)
- Cleanups around vblank as well as allowing lockless counter reads (Chris W.)
- VGA Switcheroo added to MAINTAINERS with Lukas Wunner as reviewer (Lukas)
Drivers:
- Enhancements to rockchip driver probe (Jeffy) and dsi (Chris Z.)
- Thunderbolt external GPU awareness added (Lukas)
* tag 'drm-misc-next-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc: (63 commits)
apple-gmux: Don't switch external DP port on 2011+ MacBook Pros
drm/nouveau: Don't register Thunderbolt eGPU with vga_switcheroo
drm/amdgpu: Don't register Thunderbolt eGPU with vga_switcheroo
drm/radeon: Don't register Thunderbolt eGPU with vga_switcheroo
PCI: Recognize Thunderbolt devices
MAINTAINERS: Add Lukas Wunner as reviewer for vga_switcheroo
drm: Fix locking gotcha in page_flip ioctl
drm: Clarify the role of plane_state argument to drm_simple update().
drm: Clear e after kfree in drm_mode_page_flip_ioctl
drm: Convert cmpxchg(bool) back to a two step operation
drm/bridge: ti-tfp410: support hpd via gpio
drm: use .hword to represent 16-bit numbers
Revert unrelated part of "drm: simplify the locking in the GETCRTC ioctl"
drm: Fixup failure paths in drm_atomic_helper_set_config
drm: Peek at the current counter/timestamp for vblank queries
drm: Refactor vblank sequence number comparison
drm: vblank cannot be enabled if dev->irq_enabled is false
drm: Mark up accesses of vblank->enabled outside of its spinlock
drm: Make the decision to keep vblank irq enabled earlier
drm/atomic-helper: Remove the backoff hack from set_config
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index be86eee3353f..fa8479e1799a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4145,6 +4145,7 @@ F: Documentation/devicetree/bindings/video/ F: Documentation/gpu/ F: include/drm/ F: include/uapi/drm/ +F: include/linux/vga* DRM DRIVERS AND MISC GPU PATCHES M: Daniel Vetter <daniel.vetter@intel.com> @@ -4158,6 +4159,7 @@ F: drivers/gpu/vga/ F: drivers/gpu/drm/* F: include/drm/drm* F: include/uapi/drm/drm* +F: include/linux/vga* DRM DRIVER FOR AST SERVER GRAPHICS CHIPS M: Dave Airlie <airlied@redhat.com> @@ -13257,6 +13259,14 @@ L: kvm@vger.kernel.org S: Maintained F: drivers/vfio/platform/ +VGA_SWITCHEROO +R: Lukas Wunner <lukas@wunner.de> +S: Maintained +F: Documentation/gpu/vga-switcheroo.rst +F: drivers/gpu/vga/vga_switcheroo.c +F: include/linux/vga_switcheroo.h +T: git git://anongit.freedesktop.org/drm/drm-misc + VIDEOBUF2 FRAMEWORK M: Pawel Osciak <pawel@osciak.com> M: Marek Szyprowski <m.szyprowski@samsung.com> |