diff options
| author | Lingfeng Yang <lfy@google.com> | 2020-04-16 09:50:45 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-04-17 15:31:00 -0700 |
| commit | 9c350c6dbf6ddb6b643fc4d005dff1d94838fec3 (patch) | |
| tree | b9d7183660210d1b0f13ad8c8c30e85ea23ca0c5 /include/uapi | |
| parent | b47c175e70b5e93f88c907b893a81fb713fc507d (diff) | |
CHROMIUM: virtwl: store plane info per virtio_gpu_object
This change extends the drm_virtgpu_resource_info struct to include that
plane info.
BUG=chromium:875998
TEST=wayland-simple-egl
Signed-off-by: Zach Reizner <zachr@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1351813
Commit-Ready: David Riley <davidriley@chromium.org>
Tested-by: David Riley <davidriley@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
[rebase54(groeck): Context conflicts]
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Bug: 153580313
Signed-off-by: Lingfeng Yang <lfy@google.com>
Change-Id: I1ef98e718a14204f6beb9fd81f48f15bda6052f9
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/virtgpu_drm.h | 8 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_gpu.h | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index a7c2ce87773b..8211b48f2241 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -116,7 +116,13 @@ struct drm_virtgpu_resource_info { __u32 bo_handle; __u32 res_handle; __u32 size; - __u32 stride; + union { + __u32 stride; + __u32 strides[4]; /* strides[0] is accessible with stride. */ + }; + __u32 num_planes; + __u32 offsets[4]; + __u64 format_modifier; }; struct drm_virtgpu_3d_box { diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h index 01d4681e796d..67da04441e32 100644 --- a/include/uapi/linux/virtio_gpu.h +++ b/include/uapi/linux/virtio_gpu.h @@ -87,6 +87,7 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_RESP_OK_CAPSET_INFO, VIRTIO_GPU_RESP_OK_CAPSET, VIRTIO_GPU_RESP_OK_EDID, + VIRTIO_GPU_RESP_OK_RESOURCE_PLANE_INFO, /* error responses */ VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200, @@ -316,6 +317,15 @@ struct virtio_gpu_resp_edid { __u8 edid[1024]; }; +/* VIRTIO_GPU_RESP_OK_RESOURCE_PLANE_INFO */ +struct virtio_gpu_resp_resource_plane_info { + struct virtio_gpu_ctrl_hdr hdr; + __le32 num_planes; + __le64 format_modifier; + __le32 strides[4]; + __le32 offsets[4]; +}; + #define VIRTIO_GPU_EVENT_DISPLAY (1 << 0) struct virtio_gpu_config { |