History

Merge tag 'drm-misc-next-2019-04-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v5.2: UAPI Changes: - Document which feature flags belong to which command in virtio_gpu.h - Make the FB_DAMAGE_CLIPS available for atomic userspace only, it's useless for legacy. Cross-subsystem Changes: - Add device tree bindings for lg,acx467akm-7 panel and ST-Ericsson Multi Channel Display Engine MCDE - Add parameters to the device tree bindings for tfp410 - iommu/io-pgtable: Add ARM Mali midgard MMU page table format - dma-buf: Only do a 64-bits seqno compare when driver explicitly asks for it, else wraparound. - Use the 64-bits compare for dma-fence-chains Core Changes: - Make the fb conversion functions use __iomem dst. - Rename drm_client_add to drm_client_register - Move intel_fb_initial_config to core. - Add a drm_gem_objects_lookup helper - Add drm_gem_fence_array helpers, and use it in lima. - Add drm_format_helper.c to kerneldoc. Driver Changes: - Add panfrost driver for mali midgard/bitfrost. - Converts bochs to use the simple display type. - Small fixes to sun4i, tinydrm, ti-fp410. - Fid aspeed's Kconfig options. - Make some symbols/functions static in lima, sun4i and meson. - Add a driver for the lg,acx467akm-7 panel. Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 7 years ago

Commit 8d8f6f72 parents b1c4f7f debcd8f66 files · +4506 −681Browse files

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

Unified · Split

include/uapi/linux/virtio_gpu.h+10−2
@@ -40,8 +40,16 @@ · 39 unmodified lines
4040
4141 #include <linux/types.h>
4242
43−#define VIRTIO_GPU_F_VIRGL 0
44−#define VIRTIO_GPU_F_EDID 1
43+/*
44+ * VIRTIO_GPU_CMD_CTX_*
45+ * VIRTIO_GPU_CMD_*_3D
46+ */
47+#define VIRTIO_GPU_F_VIRGL 0
48+
49+/*
50+ * VIRTIO_GPU_CMD_GET_EDID
51+ */
52+#define VIRTIO_GPU_F_EDID 1
4553
4654 enum virtio_gpu_ctrl_type {
4755 VIRTIO_GPU_UNDEFINED = 0,