mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-gpu: blob prep

Browse Source 
This adds preparatory functions needed to:

     - decode blob cmds
     - tracking iovecs

Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Alyssa Ross <hi@alyssa.is>
Tested-by: Emmanouil Pitsidianakis <manos.pitsidianakis@linaro.org>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Huang Rui <ray.huang@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Emmanouil Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
This commit is contained in:
Antonio Caggiano 2023-03-12 17:22:29 +08:00 committed by Marc-André Lureau
parent ba62dfa707
commit 49a8b65932
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/display/virtio-gpu.c
View File

@ -33,15 +33,11 @@
#define VIRTIO_GPU_VM_VERSION 1 #define VIRTIO_GPU_VM_VERSION 1
static struct virtio_gpu_simple_resource*
virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
static struct virtio_gpu_simple_resource * static struct virtio_gpu_simple_resource *
virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t resource_id, virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t resource_id,
bool require_backing, bool require_backing,
const char *caller, uint32_t *error); const char *caller, uint32_t *error);
static void virtio_gpu_cleanup_mapping(VirtIOGPU *g,
struct virtio_gpu_simple_resource *res);
static void virtio_gpu_reset_bh(void *opaque); static void virtio_gpu_reset_bh(void *opaque);
void virtio_gpu_update_cursor_data(VirtIOGPU *g, void virtio_gpu_update_cursor_data(VirtIOGPU *g,
@ -116,7 +112,7 @@ static void update_cursor(VirtIOGPU *g, struct virtio_gpu_update_cursor *cursor)
cursor->resource_id ? 1 : 0); cursor->resource_id ? 1 : 0);
} }
static struct virtio_gpu_simple_resource * struct virtio_gpu_simple_resource *
virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id) virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id)
{ {
struct virtio_gpu_simple_resource *res; struct virtio_gpu_simple_resource *res;
@ -904,8 +900,8 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,
g_free(iov); g_free(iov);
} }
static void virtio_gpu_cleanup_mapping(VirtIOGPU *g, void virtio_gpu_cleanup_mapping(VirtIOGPU *g,
struct virtio_gpu_simple_resource *res) struct virtio_gpu_simple_resource *res)
{ {
virtio_gpu_cleanup_mapping_iov(g, res->iov, res->iov_cnt); virtio_gpu_cleanup_mapping_iov(g, res->iov, res->iov_cnt);
res->iov = NULL; res->iov = NULL;

15
include/hw/virtio/virtio-gpu-bswap.h
View File

@ -70,6 +70,21 @@ virtio_gpu_create_blob_bswap(struct virtio_gpu_resource_create_blob *cblob)
le64_to_cpus(&cblob->size); le64_to_cpus(&cblob->size);
} }
static inline void
virtio_gpu_map_blob_bswap(struct virtio_gpu_resource_map_blob *mblob)
{
virtio_gpu_ctrl_hdr_bswap(&mblob->hdr);
le32_to_cpus(&mblob->resource_id);
le64_to_cpus(&mblob->offset);
}
static inline void
virtio_gpu_unmap_blob_bswap(struct virtio_gpu_resource_unmap_blob *ublob)
{
virtio_gpu_ctrl_hdr_bswap(&ublob->hdr);
le32_to_cpus(&ublob->resource_id);
}
static inline void static inline void
virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb) virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb)
{ {

5
include/hw/virtio/virtio-gpu.h
View File

@ -257,6 +257,9 @@ void virtio_gpu_base_fill_display_info(VirtIOGPUBase *g,
void virtio_gpu_base_generate_edid(VirtIOGPUBase *g, int scanout, void virtio_gpu_base_generate_edid(VirtIOGPUBase *g, int scanout,
struct virtio_gpu_resp_edid *edid); struct virtio_gpu_resp_edid *edid);
/* virtio-gpu.c */ /* virtio-gpu.c */
struct virtio_gpu_simple_resource *
virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
void virtio_gpu_ctrl_response(VirtIOGPU *g, void virtio_gpu_ctrl_response(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd, struct virtio_gpu_ctrl_command *cmd,
struct virtio_gpu_ctrl_hdr *resp, struct virtio_gpu_ctrl_hdr *resp,
@ -275,6 +278,8 @@ int virtio_gpu_create_mapping_iov(VirtIOGPU *g,
uint32_t *niov); uint32_t *niov);
void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g, void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g,
struct iovec *iov, uint32_t count); struct iovec *iov, uint32_t count);
void virtio_gpu_cleanup_mapping(VirtIOGPU *g,
struct virtio_gpu_simple_resource *res);
void virtio_gpu_process_cmdq(VirtIOGPU *g); void virtio_gpu_process_cmdq(VirtIOGPU *g);
void virtio_gpu_device_realize(DeviceState *qdev, Error **errp); void virtio_gpu_device_realize(DeviceState *qdev, Error **errp);
void virtio_gpu_reset(VirtIODevice *vdev); void virtio_gpu_reset(VirtIODevice *vdev);