| Message ID | 20240622215511.154763-11-dmitry.osipenko@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support blob memory and venus on qemu | expand |
On 2024/06/23 6:55, Dmitry Osipenko wrote: > From: Robert Beckett <bob.beckett@collabora.com> > > Support displaying blob resources by handling SET_SCANOUT_BLOB > command. > > Signed-by: Antonio Caggiano <antonio.caggiano@collabora.com> > Signed-off-by: Robert Beckett <bob.beckett@collabora.com> > Signed-off-by: Huang Rui <ray.huang@amd.com> > Reviewed-by: Antonio Caggiano <quic_acaggian@quicinc.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > --- > hw/display/virtio-gpu-virgl.c | 109 +++++++++++++++++++++++++++++++++ > hw/display/virtio-gpu.c | 12 ++-- > include/hw/virtio/virtio-gpu.h | 7 +++ > 3 files changed, 122 insertions(+), 6 deletions(-) > > diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c > index 3ffea478e723..60befab7efc2 100644 > --- a/hw/display/virtio-gpu-virgl.c > +++ b/hw/display/virtio-gpu-virgl.c > @@ -17,6 +17,8 @@ > #include "trace.h" > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-gpu.h" > +#include "hw/virtio/virtio-gpu-bswap.h" > +#include "hw/virtio/virtio-gpu-pixman.h" > > #include "ui/egl-helpers.h" > > @@ -78,6 +80,7 @@ static void virgl_cmd_create_resource_2d(VirtIOGPU *g, > res->base.height = c2d.height; > res->base.format = c2d.format; > res->base.resource_id = c2d.resource_id; > + res->base.dmabuf_fd = -1; > QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); > > args.handle = c2d.resource_id; > @@ -125,6 +128,7 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g, > res->base.height = c3d.height; > res->base.format = c3d.format; > res->base.resource_id = c3d.resource_id; > + res->base.dmabuf_fd = -1; > QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); > > args.handle = c3d.resource_id; > @@ -509,6 +513,106 @@ static void virgl_cmd_get_capset(VirtIOGPU *g, > g_free(resp); > } > > +#if VIRGL_VERSION_MAJOR >= 1 > +static void virgl_cmd_set_scanout_blob(VirtIOGPU *g, > + struct virtio_gpu_ctrl_command *cmd) > +{ > + struct virtio_gpu_framebuffer fb = { 0 }; > + struct virgl_renderer_resource_info info; > + struct virtio_gpu_virgl_resource *res; > + struct virtio_gpu_set_scanout_blob ss; > + uint64_t fbend; > + > + VIRTIO_GPU_FILL_CMD(ss); > + virtio_gpu_scanout_blob_bswap(&ss); > + trace_virtio_gpu_cmd_set_scanout_blob(ss.scanout_id, ss.resource_id, > + ss.r.width, ss.r.height, ss.r.x, > + ss.r.y); > + > + if (ss.scanout_id >= g->parent_obj.conf.max_outputs) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %d", > + __func__, ss.scanout_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; > + return; > + } > + > + if (ss.resource_id == 0) { > + virtio_gpu_disable_scanout(g, ss.scanout_id); > + return; > + } > + > + if (ss.width < 16 || > + ss.height < 16 || > + ss.r.x + ss.r.width > ss.width || > + ss.r.y + ss.r.height > ss.height) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout %d bounds for" > + " resource %d, rect (%d,%d)+%d,%d, fb %d %d\n", > + __func__, ss.scanout_id, ss.resource_id, > + ss.r.x, ss.r.y, ss.r.width, ss.r.height, > + ss.width, ss.height); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; > + return; > + } > + > + res = virtio_gpu_virgl_find_resource(g, ss.resource_id); > + if (!res) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n", > + __func__, ss.resource_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + if (virgl_renderer_resource_get_info(ss.resource_id, &info)) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not have info %d\n", > + __func__, ss.resource_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + if (res->base.dmabuf_fd < 0) { > + res->base.dmabuf_fd = info.fd; Just in case you missed my previous email: > res->base.dmabuf_fd is conditionally assigned but > virgl_renderer_resource_get_info() is called unconditionally, which is > inconsistent. > The relevant code is better to be moved into > virgl_cmd_resource_create_blob() for consistenty with > virtio_gpu_resource_create_blob().
On 6/23/24 08:44, Akihiko Odaki wrote: > On 2024/06/23 6:55, Dmitry Osipenko wrote: >> From: Robert Beckett <bob.beckett@collabora.com> >> >> Support displaying blob resources by handling SET_SCANOUT_BLOB >> command. >> >> Signed-by: Antonio Caggiano <antonio.caggiano@collabora.com> >> Signed-off-by: Robert Beckett <bob.beckett@collabora.com> >> Signed-off-by: Huang Rui <ray.huang@amd.com> >> Reviewed-by: Antonio Caggiano <quic_acaggian@quicinc.com> >> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> >> --- >> hw/display/virtio-gpu-virgl.c | 109 +++++++++++++++++++++++++++++++++ >> hw/display/virtio-gpu.c | 12 ++-- >> include/hw/virtio/virtio-gpu.h | 7 +++ >> 3 files changed, 122 insertions(+), 6 deletions(-) >> >> diff --git a/hw/display/virtio-gpu-virgl.c >> b/hw/display/virtio-gpu-virgl.c >> index 3ffea478e723..60befab7efc2 100644 >> --- a/hw/display/virtio-gpu-virgl.c >> +++ b/hw/display/virtio-gpu-virgl.c >> @@ -17,6 +17,8 @@ >> #include "trace.h" >> #include "hw/virtio/virtio.h" >> #include "hw/virtio/virtio-gpu.h" >> +#include "hw/virtio/virtio-gpu-bswap.h" >> +#include "hw/virtio/virtio-gpu-pixman.h" >> #include "ui/egl-helpers.h" >> @@ -78,6 +80,7 @@ static void virgl_cmd_create_resource_2d(VirtIOGPU >> *g, >> res->base.height = c2d.height; >> res->base.format = c2d.format; >> res->base.resource_id = c2d.resource_id; >> + res->base.dmabuf_fd = -1; >> QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); >> args.handle = c2d.resource_id; >> @@ -125,6 +128,7 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU >> *g, >> res->base.height = c3d.height; >> res->base.format = c3d.format; >> res->base.resource_id = c3d.resource_id; >> + res->base.dmabuf_fd = -1; >> QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); >> args.handle = c3d.resource_id; >> @@ -509,6 +513,106 @@ static void virgl_cmd_get_capset(VirtIOGPU *g, >> g_free(resp); >> } >> +#if VIRGL_VERSION_MAJOR >= 1 >> +static void virgl_cmd_set_scanout_blob(VirtIOGPU *g, >> + struct virtio_gpu_ctrl_command >> *cmd) >> +{ >> + struct virtio_gpu_framebuffer fb = { 0 }; >> + struct virgl_renderer_resource_info info; >> + struct virtio_gpu_virgl_resource *res; >> + struct virtio_gpu_set_scanout_blob ss; >> + uint64_t fbend; >> + >> + VIRTIO_GPU_FILL_CMD(ss); >> + virtio_gpu_scanout_blob_bswap(&ss); >> + trace_virtio_gpu_cmd_set_scanout_blob(ss.scanout_id, ss.resource_id, >> + ss.r.width, ss.r.height, >> ss.r.x, >> + ss.r.y); >> + >> + if (ss.scanout_id >= g->parent_obj.conf.max_outputs) { >> + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id >> specified %d", >> + __func__, ss.scanout_id); >> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; >> + return; >> + } >> + >> + if (ss.resource_id == 0) { >> + virtio_gpu_disable_scanout(g, ss.scanout_id); >> + return; >> + } >> + >> + if (ss.width < 16 || >> + ss.height < 16 || >> + ss.r.x + ss.r.width > ss.width || >> + ss.r.y + ss.r.height > ss.height) { >> + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout %d bounds >> for" >> + " resource %d, rect (%d,%d)+%d,%d, fb %d %d\n", >> + __func__, ss.scanout_id, ss.resource_id, >> + ss.r.x, ss.r.y, ss.r.width, ss.r.height, >> + ss.width, ss.height); >> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; >> + return; >> + } >> + >> + res = virtio_gpu_virgl_find_resource(g, ss.resource_id); >> + if (!res) { >> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist >> %d\n", >> + __func__, ss.resource_id); >> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; >> + return; >> + } >> + if (virgl_renderer_resource_get_info(ss.resource_id, &info)) { >> + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not have >> info %d\n", >> + __func__, ss.resource_id); >> + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; >> + return; >> + } >> + if (res->base.dmabuf_fd < 0) { >> + res->base.dmabuf_fd = info.fd; > > Just in case you missed my previous email: >> res->base.dmabuf_fd is conditionally assigned but >> virgl_renderer_resource_get_info() is called unconditionally, which is >> inconsistent. > >> The relevant code is better to be moved into >> virgl_cmd_resource_create_blob() for consistenty with >> virtio_gpu_resource_create_blob(). Right, I squashed this change into patch #12 instead of #10 by mistake. Will fix it shortly, thanks for the review!
diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 3ffea478e723..60befab7efc2 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -17,6 +17,8 @@ #include "trace.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" +#include "hw/virtio/virtio-gpu-bswap.h" +#include "hw/virtio/virtio-gpu-pixman.h" #include "ui/egl-helpers.h" @@ -78,6 +80,7 @@ static void virgl_cmd_create_resource_2d(VirtIOGPU *g, res->base.height = c2d.height; res->base.format = c2d.format; res->base.resource_id = c2d.resource_id; + res->base.dmabuf_fd = -1; QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); args.handle = c2d.resource_id; @@ -125,6 +128,7 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g, res->base.height = c3d.height; res->base.format = c3d.format; res->base.resource_id = c3d.resource_id; + res->base.dmabuf_fd = -1; QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); args.handle = c3d.resource_id; @@ -509,6 +513,106 @@ static void virgl_cmd_get_capset(VirtIOGPU *g, g_free(resp); } +#if VIRGL_VERSION_MAJOR >= 1 +static void virgl_cmd_set_scanout_blob(VirtIOGPU *g, + struct virtio_gpu_ctrl_command *cmd) +{ + struct virtio_gpu_framebuffer fb = { 0 }; + struct virgl_renderer_resource_info info; + struct virtio_gpu_virgl_resource *res; + struct virtio_gpu_set_scanout_blob ss; + uint64_t fbend; + + VIRTIO_GPU_FILL_CMD(ss); + virtio_gpu_scanout_blob_bswap(&ss); + trace_virtio_gpu_cmd_set_scanout_blob(ss.scanout_id, ss.resource_id, + ss.r.width, ss.r.height, ss.r.x, + ss.r.y); + + if (ss.scanout_id >= g->parent_obj.conf.max_outputs) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %d", + __func__, ss.scanout_id); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; + return; + } + + if (ss.resource_id == 0) { + virtio_gpu_disable_scanout(g, ss.scanout_id); + return; + } + + if (ss.width < 16 || + ss.height < 16 || + ss.r.x + ss.r.width > ss.width || + ss.r.y + ss.r.height > ss.height) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout %d bounds for" + " resource %d, rect (%d,%d)+%d,%d, fb %d %d\n", + __func__, ss.scanout_id, ss.resource_id, + ss.r.x, ss.r.y, ss.r.width, ss.r.height, + ss.width, ss.height); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } + + res = virtio_gpu_virgl_find_resource(g, ss.resource_id); + if (!res) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n", + __func__, ss.resource_id); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; + return; + } + if (virgl_renderer_resource_get_info(ss.resource_id, &info)) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not have info %d\n", + __func__, ss.resource_id); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; + return; + } + if (res->base.dmabuf_fd < 0) { + res->base.dmabuf_fd = info.fd; + } + if (res->base.dmabuf_fd < 0) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource not backed by dmabuf %d\n", + __func__, ss.resource_id); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; + return; + } + + fb.format = virtio_gpu_get_pixman_format(ss.format); + if (!fb.format) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: pixel format not supported %d\n", + __func__, ss.format); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } + + fb.bytes_pp = DIV_ROUND_UP(PIXMAN_FORMAT_BPP(fb.format), 8); + fb.width = ss.width; + fb.height = ss.height; + fb.stride = ss.strides[0]; + fb.offset = ss.offsets[0] + ss.r.x * fb.bytes_pp + ss.r.y * fb.stride; + + fbend = fb.offset; + fbend += fb.stride * (ss.r.height - 1); + fbend += fb.bytes_pp * ss.r.width; + if (fbend > res->base.blob_size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: fb end out of range\n", + __func__); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } + + g->parent_obj.enable = 1; + if (virtio_gpu_update_dmabuf(g, ss.scanout_id, &res->base, &fb, &ss.r)) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: failed to update dmabuf\n", + __func__); + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } + + virtio_gpu_update_scanout(g, ss.scanout_id, &res->base, &fb, &ss.r); +} +#endif + void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd) { @@ -575,6 +679,11 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, case VIRTIO_GPU_CMD_GET_EDID: virtio_gpu_get_edid(g, cmd); break; +#if VIRGL_VERSION_MAJOR >= 1 + case VIRTIO_GPU_CMD_SET_SCANOUT_BLOB: + virgl_cmd_set_scanout_blob(g, cmd); + break; +#endif default: cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; break; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 40a9d089710c..95091c4b7924 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -380,7 +380,7 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU *g, QTAILQ_INSERT_HEAD(&g->reslist, res, next); } -static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id) +void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id) { struct virtio_gpu_scanout *scanout = &g->parent_obj.scanout[scanout_id]; struct virtio_gpu_simple_resource *res; @@ -597,11 +597,11 @@ static void virtio_unref_resource(pixman_image_t *image, void *data) pixman_image_unref(data); } -static void virtio_gpu_update_scanout(VirtIOGPU *g, - uint32_t scanout_id, - struct virtio_gpu_simple_resource *res, - struct virtio_gpu_framebuffer *fb, - struct virtio_gpu_rect *r) +void virtio_gpu_update_scanout(VirtIOGPU *g, + uint32_t scanout_id, + struct virtio_gpu_simple_resource *res, + struct virtio_gpu_framebuffer *fb, + struct virtio_gpu_rect *r) { struct virtio_gpu_simple_resource *ores; struct virtio_gpu_scanout *scanout; diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 6e71d799e5da..1e9257005b76 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -338,6 +338,13 @@ int virtio_gpu_update_dmabuf(VirtIOGPU *g, struct virtio_gpu_framebuffer *fb, struct virtio_gpu_rect *r); +void virtio_gpu_update_scanout(VirtIOGPU *g, + uint32_t scanout_id, + struct virtio_gpu_simple_resource *res, + struct virtio_gpu_framebuffer *fb, + struct virtio_gpu_rect *r); +void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id); + /* virtio-gpu-3d.c */ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd);