virtio-gpu-3d: add support for second capability set (v4)
PATCH 1/1 virtio-gpu-3d: add support for second capability set (v4)
From: Dave Airlie <[email protected]>
Due to a kernel bug we can never increase the size of capability set 1, so introduce a new capability set in parallel, old userspace will continue to use the old set, new userspace will start using the new one when it detects a fixed kernel.
v2: don't use a define from virglrenderer, just probe it.
v3: fix compilation when virglrenderer disabled
v4: fix style warning, just use ?: op instead.
--- hw/display/virtio-gpu-3d.c | 15 +++++++++++++++ hw/display/virtio-gpu.c | 7 ++++++- include/hw/virtio/virtio-gpu.h | 2 +- include/standard-headers/linux/virtio_gpu.h | 1 + 4 files changed, 23 insertions(+), 2 deletions(-)
hw/display/virtio-gpu-3d.c +15 -0
@@ -362,6 +362,11 @@ static void virgl_cmd_get_capset_info(VirtIOGPU *g,virgl_renderer_get_cap_set (resp.capset_id, &resp.capset_max_version, &resp.capset_max_size); + }else if (info.capset_index ==1 ) { + resp.capset_id =VIRTIO_GPU_CAPSET_VIRGL2 ; +virgl_renderer_get_cap_set (resp.capset_id, + &resp.capset_max_version, + &resp.capset_max_size); }else { resp.capset_max_version =0 ; resp.capset_max_size =0 ;
@@ -635,4 +640,14 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) return 0; } +int virtio_gpu_virgl_get_num_capsets (VirtIOGPU *g) +{ +uint32_t capset2_max_ver, capset2_max_size; +virgl_renderer_get_cap_set (VIRTIO_GPU_CAPSET_VIRGL2 , + &capset2_max_ver, + &capset2_max_size); + +return capset2_max_ver ?2 :1 ; +} +#endif /* CONFIG_VIRGL */
hw/display/virtio-gpu.c +6 -1
@@ -1215,7 +1215,12 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)/* use larger control queue in 3d mode */ g->ctrl_vq =virtio_add_queue (vdev,256 , virtio_gpu_handle_ctrl_cb); g->cursor_vq =virtio_add_queue (vdev,16 , virtio_gpu_handle_cursor_cb); - g->virtio_config.num_capsets =1 ; + +#if defined(CONFIG_VIRGL ) + g->virtio_config.num_capsets =virtio_gpu_virgl_get_num_capsets (g); +#else + g->virtio_config.num_capsets =0 ; +#endif }else { g->ctrl_vq =virtio_add_queue (vdev,64 , virtio_gpu_handle_ctrl_cb); g->cursor_vq =virtio_add_queue (vdev,16 , virtio_gpu_handle_cursor_cb);
include/hw/virtio/virtio-gpu.h +1 -1
@@ -171,5 +171,5 @@ void virtio_gpu_virgl_fence_poll(VirtIOGPU *g);void virtio_gpu_virgl_reset (VirtIOGPU *g);void virtio_gpu_gl_block (void *opaque,bool block);int virtio_gpu_virgl_init (VirtIOGPU *g); - +int virtio_gpu_virgl_get_num_capsets (VirtIOGPU *g);#endif
include/standard-headers/linux/virtio_gpu.h +1 -0
@@ -260,6 +260,7 @@ struct virtio_gpu_cmd_submit { };#define VIRTIO_GPU_CAPSET_VIRGL 1 +#define VIRTIO_GPU_CAPSET_VIRGL2 2/* VIRTIO_GPU_CMD_GET_CAPSET_INFO */ struct virtio_gpu_get_capset_info {
Signature · 1 line
2.14.3
Gerd,
This seems to have passed the bots, but realised I hadn't cc'ed you.
Please pick it up whenever you get a chance.
Dave.
Quoted 95 lines · Dave Airlie
From: Dave Airlie <[email protected]>
Due to a kernel bug we can never increase the size of capability set 1, so introduce a new capability set in parallel, old userspace will continue to use the old set, new userspace will start using the new one when it detects a fixed kernel.
v2: don't use a define from virglrenderer, just probe it.
v3: fix compilation when virglrenderer disabled
v4: fix style warning, just use ?: op instead.Signed-off-by Dave Airlie <[email protected]>--- hw/display/virtio-gpu-3d.c | 15 +++++++++++++++ hw/display/virtio-gpu.c | 7 ++++++- include/hw/virtio/virtio-gpu.h | 2 +- include/standard-headers/linux/virtio_gpu.h | 1 + 4 files changed, 23 insertions(+), 2 deletions(-)hw/display/virtio-gpu-3d.c +15
-0@@ -362,6 +362,11 @@ static void virgl_cmd_get_capset_info(VirtIOGPU *g,virgl_renderer_get_cap_set (resp.capset_id, &resp.capset_max_version, &resp.capset_max_size); + }else if (info.capset_index ==1 ) { + resp.capset_id =VIRTIO_GPU_CAPSET_VIRGL2 ; +virgl_renderer_get_cap_set (resp.capset_id, + &resp.capset_max_version, + &resp.capset_max_size); }else { resp.capset_max_version =0 ; resp.capset_max_size =0 ;@@ -635,4 +640,14 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) return 0; } +int virtio_gpu_virgl_get_num_capsets (VirtIOGPU *g) +{ +uint32_t capset2_max_ver, capset2_max_size; +virgl_renderer_get_cap_set (VIRTIO_GPU_CAPSET_VIRGL2 , + &capset2_max_ver, + &capset2_max_size); + +return capset2_max_ver ?2 :1 ; +} +#endif /* CONFIG_VIRGL */ hw/display/virtio-gpu.c +6
-1@@ -1215,7 +1215,12 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)/* use larger control queue in 3d mode */ g->ctrl_vq =virtio_add_queue (vdev,256 , virtio_gpu_handle_ctrl_cb); g->cursor_vq =virtio_add_queue (vdev,16 , virtio_gpu_handle_cursor_cb); - g->virtio_config.num_capsets =1 ; + +#if defined(CONFIG_VIRGL ) + g->virtio_config.num_capsets =virtio_gpu_virgl_get_num_capsets (g); +#else + g->virtio_config.num_capsets =0 ; +#endif }else { g->ctrl_vq =virtio_add_queue (vdev,64 , virtio_gpu_handle_ctrl_cb); g->cursor_vq =virtio_add_queue (vdev,16 , virtio_gpu_handle_cursor_cb);include/hw/virtio/virtio-gpu.h +1
-1@@ -171,5 +171,5 @@ void virtio_gpu_virgl_fence_poll(VirtIOGPU *g);void virtio_gpu_virgl_reset (VirtIOGPU *g);void virtio_gpu_gl_block (void *opaque,bool block);int virtio_gpu_virgl_init (VirtIOGPU *g); - +int virtio_gpu_virgl_get_num_capsets (VirtIOGPU *g);#endif include/standard-headers/linux/virtio_gpu.h +1
-1@@ -260,6 +260,7 @@ struct virtio_gpu_cmd_submit { };#define VIRTIO_GPU_CAPSET_VIRGL 1 +#define VIRTIO_GPU_CAPSET_VIRGL2 2/* VIRTIO_GPU_CMD_GET_CAPSET_INFO */ struct virtio_gpu_get_capset_info { --2.14.3