Misc stuff all over: - more mode_fixup removal from Carlos, there's another final pile still left. - final bits of vgaswitcheroo from Lukas for apple gmux, we're still discussing an api cleanup patch to make it a bit more abuse-safe as a follow-up - dp aux interface for userspace for tools&tests from Rafael Antognolli - actual interface parts for dma-buf flushing for userspace mmap - few small bits all over - vgaswitcheroo support for apple gmux from Lukas Wunner - checks for ->mode_fixup in non-atomic helpers from Carlos Palminha, plus removing dummy funcs from drivers. Carlos promised to follow up with more, since there's lots more silly dummy functions around. - dma-buf patches from Tiago, except the ioctl itself (that needed a respin to address review from David Herrmann) - encoder mask for atomic from Maarten - bunch of random things all over. * tag 'topic/drm-misc-2016-02-18' of git://anongit.freedesktop.org/drm-intel: (57 commits) drm/udl: Use module_usb_driver drm: fixes crct set_mode when crtc mode_fixup is null. drm/tilcdc: removed optional dummy encoder mode_fixup function. drm/sti: removed optional dummy encoder mode_fixup function. drm/rockchip: removed optional dummy encoder mode_fixup function. drm/qxl: removed optional dummy encoder mode_fixup function. drm/mgag200: removed optional dummy encoder mode_fixup function. drm/msm/mdp: removed optional dummy encoder mode_fixup function. drm/imx: removed optional dummy encoder mode_fixup function. drm/gma500: removed optional dummy encoder mode_fixup function. drm/radeon: removed optional dummy encoder mode_fixup function. drm/cirrus: removed optional dummy encoder mode_fixup function. drm/bochs: removed optional dummy encoder mode_fixup function. drm/ast: removed optional dummy encoder mode_fixup function. drm/amdgpu: removed optional dummy encoder mode_fixup function. drm/exynos: removed optional dummy encoder mode_fixup function. drm/udl: removed optional dummy encoder mode_fixup function. drm/virtio: removed optional dummy encoder mode_fixup function. drm/fb_helper: Use add_one_connector in add_all_connectors. drm/fb_helper: Use correct allocation count for arrays. ...
Showing the changes to include/uapi (2 of 83 files). Show all
Unified · Split
| @@ -669,6 +669,7 @@ struct drm_set_client_cap { · 668 unmodified lines | |||
| 669 | __u64 value; | 669 | __u64 value; |
| 670 | }; | 670 | }; |
| 671 | 671 | ||
| 672 | #define DRM_RDWR O_RDWR | ||
| 672 | #define DRM_CLOEXEC O_CLOEXEC | 673 | #define DRM_CLOEXEC O_CLOEXEC |
| 673 | struct drm_prime_handle { | 674 | struct drm_prime_handle { |
| 674 | __u32 handle; | 675 | __u32 handle; |
| @@ -0,0 +1,40 @@ | |||
| 1 | /* | ||
| 2 | * Framework for buffer objects that can be shared across devices/subsystems. | ||
| 3 | * | ||
| 4 | * Copyright(C) 2015 Intel Ltd | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms of the GNU General Public License version 2 as published by | ||
| 8 | * the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 13 | * more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License along with | ||
| 16 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #ifndef _DMA_BUF_UAPI_H_ | ||
| 20 | #define _DMA_BUF_UAPI_H_ | ||
| 21 | |||
| 22 | #include <linux/types.h> | ||
| 23 | |||
| 24 | /* begin/end dma-buf functions used for userspace mmap. */ | ||
| 25 | struct dma_buf_sync { | ||
| 26 | __u64 flags; | ||
| 27 | }; | ||
| 28 | |||
| 29 | #define DMA_BUF_SYNC_READ (1 << 0) | ||
| 30 | #define DMA_BUF_SYNC_WRITE (2 << 0) | ||
| 31 | #define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) | ||
| 32 | #define DMA_BUF_SYNC_START (0 << 2) | ||
| 33 | #define DMA_BUF_SYNC_END (1 << 2) | ||
| 34 | #define DMA_BUF_SYNC_VALID_FLAGS_MASK \ | ||
| 35 | (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) | ||
| 36 | |||
| 37 | #define DMA_BUF_BASE 'b' | ||
| 38 | #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) | ||
| 39 | |||
| 40 | #endif | ||