History

Merge tag 'drm-misc-next-2020-01-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v5.6: UAPI Changes: - Commandline parser: Add support for panel orientation, and per-mode options. - Fix IOCTL naming for dma-buf heaps. Cross-subsystem Changes: - Rename DMA_HEAP_IOC_ALLOC to DMA_HEAP_IOCTL_ALLOC before it becomes abi. - Change DMA-BUF system-heap's name to system. - Fix leak in error handling in dma_heap_ioctl(), and make a symbol static. - Fix udma-buf cpu access. - Fix ti devicetree bindings. Core Changes: - Add CTA-861-G modes with VIC >= 193. - Change error handling and remove bug_on in *drm_dev_init. - Export drm_panel_of_backlight() correctly once more. - Add support for lvds decoders. - Convert drm/client and drm/(gem-,)fb-helper to drm-device based logging and update logging todo. Driver Changes: - Add support for dsi/px30 to rockchip. - Add fb damage support to virtio. - Use dma_resv locking wrappers in vc4, msm, etnaviv. - Make functions in virtio static, and perform some simplifications. - Add suspend support to sun4i. - Add A64 mipi dsi support to sun4i. - Add runtime pm suspend to komeda. - Associated driver fixes. Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 6 years ago

Commit f5c547e2 parents 3ae3271 1ce0d5167 files · +1645 −824Browse files

Showing the changes to include/uapi/linux (1 of 67 files). Show all

Unified · Split

include/uapi/linux/dma-heap.h+2−2
@@ -42,12 +42,12 @@ struct dma_heap_allocation_data { · 41 unmodified lines
42#define DMA_HEAP_IOC_MAGIC 'H'42#define DMA_HEAP_IOC_MAGIC 'H'
43 43
44/**44/**
45 * DOC: DMA_HEAP_IOC_ALLOC - allocate memory from pool45 * DOC: DMA_HEAP_IOCTL_ALLOC - allocate memory from pool
46 *46 *
47 * Takes a dma_heap_allocation_data struct and returns it with the fd field47 * Takes a dma_heap_allocation_data struct and returns it with the fd field
48 * populated with the dmabuf handle of the allocation.48 * populated with the dmabuf handle of the allocation.
49 */49 */
50#define DMA_HEAP_IOC_ALLOC _IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\50#define DMA_HEAP_IOCTL_ALLOC _IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\
51 struct dma_heap_allocation_data)51 struct dma_heap_allocation_data)
52 52
53#endif /* _UAPI_LINUX_DMABUF_POOL_H */53#endif /* _UAPI_LINUX_DMABUF_POOL_H */