History

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

drm-misc-next for 5.10: UAPI Changes: Cross-subsystem Changes: Core Changes: - ttm: various cleanups and reworks of the API Driver Changes: - ast: various cleanups - gma500: A few fixes, conversion to GPIOd API - hisilicon: Change of maintainer, various reworks - ingenic: Clock handling and formats support improvements - mcde: improvements to the DSI support - mgag200: Support G200 desktop cards - mxsfb: Support the i.MX7 and i.MX8M and the alpha plane - panfrost: support devfreq - ps8640: Retrieve the EDID from eDP control, misc improvements - tidss: Add a workaround for AM65xx YUV formats handling - virtio: a few cleanups, support for virtio-gpu exported resources - bridges: Support the chained bridges on more drivers, new bridges: Toshiba TC358762, Toshiba TC358775, Lontium LT9611 - panels: Convert to dev_ based logging, read orientation from the DT, various fixes, new panels: Mantix MLAF057WE51-X, Chefree CH101OLHLWH-002, Powertip PH800480T013, KingDisplay KD116N21-30NV-A010 Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 6 years ago

Commit cbc2e822 parents d012a71 cd6da0b296 files · +8739 −4394Browse files

Showing the changes to include/uapi (2 of 296 files). Show all

Unified · Split

2 files
  1. include/uapi/drm/drm_mode.h +13 −8
  2. include/uapi/linux/virtio_gpu.h +19 −0
include/uapi/drm/drm_mode.h+13−8
@@ -332,14 +332,19 @@ struct drm_mode_get_encoder { · 331 unmodified lines
332/* This is for connectors with multiple signal types. */332/* This is for connectors with multiple signal types. */
333/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */333/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
334enum drm_mode_subconnector {334enum drm_mode_subconnector {
335 DRM_MODE_SUBCONNECTOR_Automatic = 0,335 DRM_MODE_SUBCONNECTOR_Automatic = 0, /* DVI-I, TV */
336 DRM_MODE_SUBCONNECTOR_Unknown = 0,336 DRM_MODE_SUBCONNECTOR_Unknown = 0, /* DVI-I, TV, DP */
337 DRM_MODE_SUBCONNECTOR_DVID = 3,337 DRM_MODE_SUBCONNECTOR_VGA = 1, /* DP */
338 DRM_MODE_SUBCONNECTOR_DVIA = 4,338 DRM_MODE_SUBCONNECTOR_DVID = 3, /* DVI-I DP */
339 DRM_MODE_SUBCONNECTOR_Composite = 5,339 DRM_MODE_SUBCONNECTOR_DVIA = 4, /* DVI-I */
340 DRM_MODE_SUBCONNECTOR_SVIDEO = 6,340 DRM_MODE_SUBCONNECTOR_Composite = 5, /* TV */
341 DRM_MODE_SUBCONNECTOR_Component = 8,341 DRM_MODE_SUBCONNECTOR_SVIDEO = 6, /* TV */
342 DRM_MODE_SUBCONNECTOR_SCART = 9,342 DRM_MODE_SUBCONNECTOR_Component = 8, /* TV */
343 DRM_MODE_SUBCONNECTOR_SCART = 9, /* TV */
344 DRM_MODE_SUBCONNECTOR_DisplayPort = 10, /* DP */
345 DRM_MODE_SUBCONNECTOR_HDMIA = 11, /* DP */
346 DRM_MODE_SUBCONNECTOR_Native = 15, /* DP */
347 DRM_MODE_SUBCONNECTOR_Wireless = 18, /* DP */
343};348};
344 349
345#define DRM_MODE_CONNECTOR_Unknown 0350#define DRM_MODE_CONNECTOR_Unknown 0
include/uapi/linux/virtio_gpu.h+19−0
@@ -50,6 +50,10 @@ · 49 unmodified lines
50 * VIRTIO_GPU_CMD_GET_EDID50 * VIRTIO_GPU_CMD_GET_EDID
51 */51 */
52#define VIRTIO_GPU_F_EDID 152#define VIRTIO_GPU_F_EDID 1
53/*
54 * VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID
55 */
56#define VIRTIO_GPU_F_RESOURCE_UUID 2
53 57
54enum virtio_gpu_ctrl_type {58enum virtio_gpu_ctrl_type {
55 VIRTIO_GPU_UNDEFINED = 0,59 VIRTIO_GPU_UNDEFINED = 0,
@@ -66,6 +70,7 @@ enum virtio_gpu_ctrl_type { · 10 unmodified lines
66 VIRTIO_GPU_CMD_GET_CAPSET_INFO,70 VIRTIO_GPU_CMD_GET_CAPSET_INFO,
67 VIRTIO_GPU_CMD_GET_CAPSET,71 VIRTIO_GPU_CMD_GET_CAPSET,
68 VIRTIO_GPU_CMD_GET_EDID,72 VIRTIO_GPU_CMD_GET_EDID,
73 VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID,
69 74
70 /* 3d commands */75 /* 3d commands */
71 VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,76 VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
@@ -87,6 +92,7 @@ enum virtio_gpu_ctrl_type { · 15 unmodified lines
87 VIRTIO_GPU_RESP_OK_CAPSET_INFO,92 VIRTIO_GPU_RESP_OK_CAPSET_INFO,
88 VIRTIO_GPU_RESP_OK_CAPSET,93 VIRTIO_GPU_RESP_OK_CAPSET,
89 VIRTIO_GPU_RESP_OK_EDID,94 VIRTIO_GPU_RESP_OK_EDID,
95 VIRTIO_GPU_RESP_OK_RESOURCE_UUID,
90 96
91 /* error responses */97 /* error responses */
92 VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,98 VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@ -340,4 +346,17 @@ enum virtio_gpu_formats { · 247 unmodified lines
340 VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM = 134,346 VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM = 134,
341};347};
342 348
349/* VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID */
350struct virtio_gpu_resource_assign_uuid {
351 struct virtio_gpu_ctrl_hdr hdr;
352 __le32 resource_id;
353 __le32 padding;
354};
355
356/* VIRTIO_GPU_RESP_OK_RESOURCE_UUID */
357struct virtio_gpu_resp_resource_uuid {
358 struct virtio_gpu_ctrl_hdr hdr;
359 __u8 uuid[16];
360};
361
343#endif362#endif