| Message ID | 20230416115237.798604-4-dmitry.osipenko@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add sync object UAPI support to VirtIO-GPU driver | expand |
On 4/16/23 14:52, Dmitry Osipenko wrote: > Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects > support is needed by native context VirtIO-GPU Mesa drivers, it also will > be used by Venus and Virgl contexts. > > Reviewed-by; Emil Velikov <emil.velikov@collabora.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > --- > drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- > drivers/gpu/drm/virtio/virtgpu_submit.c | 219 ++++++++++++++++++++++++ > include/uapi/drm/virtgpu_drm.h | 16 +- > 3 files changed, 236 insertions(+), 2 deletions(-) Pierre-Eric tested this v6 patchset with the AMDGPU native context. He has problems his email/ML setup and is unable to reply here. I asked him to provide his t-b on the Mesa MR [1] and now replicating it here. [1] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21658#note_1889792 Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Hi Dmitry, On Sun, Apr 16, 2023 at 1:55 PM Dmitry Osipenko <dmitry.osipenko@collabora.com> wrote: > Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects > support is needed by native context VirtIO-GPU Mesa drivers, it also will > be used by Venus and Virgl contexts. > > Reviewed-by; Emil Velikov <emil.velikov@collabora.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Thanks for your patch! > --- a/drivers/gpu/drm/virtio/virtgpu_submit.c > +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c > +static int > +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) > +{ > + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; > + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; > + size_t syncobj_stride = exbuf->syncobj_stride; > + u32 num_in_syncobjs = exbuf->num_in_syncobjs; > + struct drm_syncobj **syncobjs; > + int ret = 0, i; > + > + if (!num_in_syncobjs) > + return 0; > + > + /* > + * kvalloc at first tries to allocate memory using kmalloc and > + * falls back to vmalloc only on failure. It also uses GFP_NOWARN GFP_NOWARN does not exist. > + * internally for allocations larger than a page size, preventing > + * storm of KMSG warnings. > + */ > + syncobjs = kvcalloc(num_in_syncobjs, sizeof(*syncobjs), GFP_KERNEL); > + if (!syncobjs) > + return -ENOMEM; > + > + for (i = 0; i < num_in_syncobjs; i++) { > + u64 address = exbuf->in_syncobjs + i * syncobj_stride; > + struct dma_fence *fence; > + Gr{oetje,eeting}s, Geert
On 6/25/23 11:47, Geert Uytterhoeven wrote: > Hi Dmitry, > > On Sun, Apr 16, 2023 at 1:55 PM Dmitry Osipenko > <dmitry.osipenko@collabora.com> wrote: >> Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects >> support is needed by native context VirtIO-GPU Mesa drivers, it also will >> be used by Venus and Virgl contexts. >> >> Reviewed-by; Emil Velikov <emil.velikov@collabora.com> >> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > > Thanks for your patch! > >> --- a/drivers/gpu/drm/virtio/virtgpu_submit.c >> +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c > >> +static int >> +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) >> +{ >> + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; >> + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; >> + size_t syncobj_stride = exbuf->syncobj_stride; >> + u32 num_in_syncobjs = exbuf->num_in_syncobjs; >> + struct drm_syncobj **syncobjs; >> + int ret = 0, i; >> + >> + if (!num_in_syncobjs) >> + return 0; >> + >> + /* >> + * kvalloc at first tries to allocate memory using kmalloc and >> + * falls back to vmalloc only on failure. It also uses GFP_NOWARN > > GFP_NOWARN does not exist. https://elixir.bootlin.com/linux/v6.4-rc7/source/include/linux/gfp_types.h#L38
Hi Dmitry, On Sun, Jun 25, 2023 at 2:41 PM Dmitry Osipenko <dmitry.osipenko@collabora.com> wrote: > On 6/25/23 11:47, Geert Uytterhoeven wrote: > > On Sun, Apr 16, 2023 at 1:55 PM Dmitry Osipenko > > <dmitry.osipenko@collabora.com> wrote: > >> Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects > >> support is needed by native context VirtIO-GPU Mesa drivers, it also will > >> be used by Venus and Virgl contexts. > >> > >> Reviewed-by; Emil Velikov <emil.velikov@collabora.com> > >> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > > > > Thanks for your patch! > > > >> --- a/drivers/gpu/drm/virtio/virtgpu_submit.c > >> +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c > > > >> +static int > >> +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) > >> +{ > >> + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; > >> + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; > >> + size_t syncobj_stride = exbuf->syncobj_stride; > >> + u32 num_in_syncobjs = exbuf->num_in_syncobjs; > >> + struct drm_syncobj **syncobjs; > >> + int ret = 0, i; > >> + > >> + if (!num_in_syncobjs) > >> + return 0; > >> + > >> + /* > >> + * kvalloc at first tries to allocate memory using kmalloc and > >> + * falls back to vmalloc only on failure. It also uses GFP_NOWARN > > > > GFP_NOWARN does not exist. > > https://elixir.bootlin.com/linux/v6.4-rc7/source/include/linux/gfp_types.h#L38 That line defines "__GFP_NOWARN", not "GFP_NOWARN". C is case- and underscore-sensitive. as is "git grep -w" ;-) Gr{oetje,eeting}s, Geert
On 6/25/23 18:36, Geert Uytterhoeven wrote: > Hi Dmitry, > > On Sun, Jun 25, 2023 at 2:41 PM Dmitry Osipenko > <dmitry.osipenko@collabora.com> wrote: >> On 6/25/23 11:47, Geert Uytterhoeven wrote: >>> On Sun, Apr 16, 2023 at 1:55 PM Dmitry Osipenko >>> <dmitry.osipenko@collabora.com> wrote: >>>> Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects >>>> support is needed by native context VirtIO-GPU Mesa drivers, it also will >>>> be used by Venus and Virgl contexts. >>>> >>>> Reviewed-by; Emil Velikov <emil.velikov@collabora.com> >>>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> >>> >>> Thanks for your patch! >>> >>>> --- a/drivers/gpu/drm/virtio/virtgpu_submit.c >>>> +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c >>> >>>> +static int >>>> +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) >>>> +{ >>>> + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; >>>> + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; >>>> + size_t syncobj_stride = exbuf->syncobj_stride; >>>> + u32 num_in_syncobjs = exbuf->num_in_syncobjs; >>>> + struct drm_syncobj **syncobjs; >>>> + int ret = 0, i; >>>> + >>>> + if (!num_in_syncobjs) >>>> + return 0; >>>> + >>>> + /* >>>> + * kvalloc at first tries to allocate memory using kmalloc and >>>> + * falls back to vmalloc only on failure. It also uses GFP_NOWARN >>> >>> GFP_NOWARN does not exist. >> >> https://elixir.bootlin.com/linux/v6.4-rc7/source/include/linux/gfp_types.h#L38 > > That line defines "__GFP_NOWARN", not "GFP_NOWARN". > C is case- and underscore-sensitive. as is "git grep -w" ;-) The removal of underscores was done intentionally for improving readability of the comment
Hi Dmitry, On Mon, Jun 26, 2023 at 6:11 PM Dmitry Osipenko <dmitry.osipenko@collabora.com> wrote: > On 6/25/23 18:36, Geert Uytterhoeven wrote: > > On Sun, Jun 25, 2023 at 2:41 PM Dmitry Osipenko > > <dmitry.osipenko@collabora.com> wrote: > >> On 6/25/23 11:47, Geert Uytterhoeven wrote: > >>> On Sun, Apr 16, 2023 at 1:55 PM Dmitry Osipenko > >>> <dmitry.osipenko@collabora.com> wrote: > >>>> Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects > >>>> support is needed by native context VirtIO-GPU Mesa drivers, it also will > >>>> be used by Venus and Virgl contexts. > >>>> > >>>> Reviewed-by; Emil Velikov <emil.velikov@collabora.com> > >>>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > >>> > >>> Thanks for your patch! > >>> > >>>> --- a/drivers/gpu/drm/virtio/virtgpu_submit.c > >>>> +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c > >>> > >>>> +static int > >>>> +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) > >>>> +{ > >>>> + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; > >>>> + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; > >>>> + size_t syncobj_stride = exbuf->syncobj_stride; > >>>> + u32 num_in_syncobjs = exbuf->num_in_syncobjs; > >>>> + struct drm_syncobj **syncobjs; > >>>> + int ret = 0, i; > >>>> + > >>>> + if (!num_in_syncobjs) > >>>> + return 0; > >>>> + > >>>> + /* > >>>> + * kvalloc at first tries to allocate memory using kmalloc and > >>>> + * falls back to vmalloc only on failure. It also uses GFP_NOWARN > >>> > >>> GFP_NOWARN does not exist. > >> > >> https://elixir.bootlin.com/linux/v6.4-rc7/source/include/linux/gfp_types.h#L38 > > > > That line defines "__GFP_NOWARN", not "GFP_NOWARN". > > C is case- and underscore-sensitive. as is "git grep -w" ;-) > > The removal of underscores was done intentionally for improving > readability of the comment Please don't do that, as IMHO it actually hampers readability: 1. For some xxx, both GFP_xxx and __GFP_xxx are defined, so it does matter which one you are referring to, 2. After dropping the underscores, "git grep -w" can no longer find the definition, nor its users. Thanks! Gr{oetje,eeting}s, Geert
27.06.2023 15:01, Geert Uytterhoeven пишет: > Hi Dmitry, > > On Mon, Jun 26, 2023 at 6:11 PM Dmitry Osipenko > <dmitry.osipenko@collabora.com> wrote: >> On 6/25/23 18:36, Geert Uytterhoeven wrote: >>> On Sun, Jun 25, 2023 at 2:41 PM Dmitry Osipenko >>> <dmitry.osipenko@collabora.com> wrote: >>>> On 6/25/23 11:47, Geert Uytterhoeven wrote: >>>>> On Sun, Apr 16, 2023 at 1:55 PM Dmitry Osipenko >>>>> <dmitry.osipenko@collabora.com> wrote: >>>>>> Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects >>>>>> support is needed by native context VirtIO-GPU Mesa drivers, it also will >>>>>> be used by Venus and Virgl contexts. >>>>>> >>>>>> Reviewed-by; Emil Velikov <emil.velikov@collabora.com> >>>>>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> >>>>> >>>>> Thanks for your patch! >>>>> >>>>>> --- a/drivers/gpu/drm/virtio/virtgpu_submit.c >>>>>> +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c >>>>> >>>>>> +static int >>>>>> +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) >>>>>> +{ >>>>>> + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; >>>>>> + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; >>>>>> + size_t syncobj_stride = exbuf->syncobj_stride; >>>>>> + u32 num_in_syncobjs = exbuf->num_in_syncobjs; >>>>>> + struct drm_syncobj **syncobjs; >>>>>> + int ret = 0, i; >>>>>> + >>>>>> + if (!num_in_syncobjs) >>>>>> + return 0; >>>>>> + >>>>>> + /* >>>>>> + * kvalloc at first tries to allocate memory using kmalloc and >>>>>> + * falls back to vmalloc only on failure. It also uses GFP_NOWARN >>>>> >>>>> GFP_NOWARN does not exist. >>>> >>>> https://elixir.bootlin.com/linux/v6.4-rc7/source/include/linux/gfp_types.h#L38 >>> >>> That line defines "__GFP_NOWARN", not "GFP_NOWARN". >>> C is case- and underscore-sensitive. as is "git grep -w" ;-) >> >> The removal of underscores was done intentionally for improving >> readability of the comment > > Please don't do that, as IMHO it actually hampers readability: > 1. For some xxx, both GFP_xxx and __GFP_xxx are defined, > so it does matter which one you are referring to, > 2. After dropping the underscores, "git grep -w" can no longer find > the definition, nor its users. > > Thanks! Alright, I'll change it
On 4/16/23 14:52, Dmitry Osipenko wrote: > Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects > support is needed by native context VirtIO-GPU Mesa drivers, it also will > be used by Venus and Virgl contexts. > > Reviewed-by; Emil Velikov <emil.velikov@collabora.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> > --- > drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- > drivers/gpu/drm/virtio/virtgpu_submit.c | 219 ++++++++++++++++++++++++ > include/uapi/drm/virtgpu_drm.h | 16 +- > 3 files changed, 236 insertions(+), 2 deletions(-) Applied to misc-next Made a minor comment change that was requested by Geert Uytterhoeven and took into account that outfence now could be NULL after the recent virtio-gpu changes
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index add075681e18..a22155577152 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -176,7 +176,8 @@ static const struct drm_driver driver = { * If KMS is disabled DRIVER_MODESET and DRIVER_ATOMIC are masked * out via drm_device::driver_features: */ - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC | + DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE, .open = virtio_gpu_driver_open, .postclose = virtio_gpu_driver_postclose, diff --git a/drivers/gpu/drm/virtio/virtgpu_submit.c b/drivers/gpu/drm/virtio/virtgpu_submit.c index cf3c04b16a7a..5a0f2526c1a0 100644 --- a/drivers/gpu/drm/virtio/virtgpu_submit.c +++ b/drivers/gpu/drm/virtio/virtgpu_submit.c @@ -14,11 +14,24 @@ #include <linux/uaccess.h> #include <drm/drm_file.h> +#include <drm/drm_syncobj.h> #include <drm/virtgpu_drm.h> #include "virtgpu_drv.h" +struct virtio_gpu_submit_post_dep { + struct drm_syncobj *syncobj; + struct dma_fence_chain *chain; + u64 point; +}; + struct virtio_gpu_submit { + struct virtio_gpu_submit_post_dep *post_deps; + unsigned int num_out_syncobjs; + + struct drm_syncobj **in_syncobjs; + unsigned int num_in_syncobjs; + struct virtio_gpu_object_array *buflist; struct drm_virtgpu_execbuffer *exbuf; struct virtio_gpu_fence *out_fence; @@ -59,6 +72,199 @@ static int virtio_gpu_dma_fence_wait(struct virtio_gpu_submit *submit, return 0; } +static void virtio_gpu_free_syncobjs(struct drm_syncobj **syncobjs, + u32 nr_syncobjs) +{ + u32 i = nr_syncobjs; + + while (i--) { + if (syncobjs[i]) + drm_syncobj_put(syncobjs[i]); + } + + kvfree(syncobjs); +} + +static int +virtio_gpu_parse_deps(struct virtio_gpu_submit *submit) +{ + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; + size_t syncobj_stride = exbuf->syncobj_stride; + u32 num_in_syncobjs = exbuf->num_in_syncobjs; + struct drm_syncobj **syncobjs; + int ret = 0, i; + + if (!num_in_syncobjs) + return 0; + + /* + * kvalloc at first tries to allocate memory using kmalloc and + * falls back to vmalloc only on failure. It also uses GFP_NOWARN + * internally for allocations larger than a page size, preventing + * storm of KMSG warnings. + */ + syncobjs = kvcalloc(num_in_syncobjs, sizeof(*syncobjs), GFP_KERNEL); + if (!syncobjs) + return -ENOMEM; + + for (i = 0; i < num_in_syncobjs; i++) { + u64 address = exbuf->in_syncobjs + i * syncobj_stride; + struct dma_fence *fence; + + memset(&syncobj_desc, 0, sizeof(syncobj_desc)); + + if (copy_from_user(&syncobj_desc, + u64_to_user_ptr(address), + min(syncobj_stride, sizeof(syncobj_desc)))) { + ret = -EFAULT; + break; + } + + if (syncobj_desc.flags & ~VIRTGPU_EXECBUF_SYNCOBJ_FLAGS) { + ret = -EINVAL; + break; + } + + ret = drm_syncobj_find_fence(submit->file, syncobj_desc.handle, + syncobj_desc.point, 0, &fence); + if (ret) + break; + + ret = virtio_gpu_dma_fence_wait(submit, fence); + + dma_fence_put(fence); + if (ret) + break; + + if (syncobj_desc.flags & VIRTGPU_EXECBUF_SYNCOBJ_RESET) { + syncobjs[i] = drm_syncobj_find(submit->file, + syncobj_desc.handle); + if (!syncobjs[i]) { + ret = -EINVAL; + break; + } + } + } + + if (ret) { + virtio_gpu_free_syncobjs(syncobjs, i); + return ret; + } + + submit->num_in_syncobjs = num_in_syncobjs; + submit->in_syncobjs = syncobjs; + + return ret; +} + +static void virtio_gpu_reset_syncobjs(struct drm_syncobj **syncobjs, + u32 nr_syncobjs) +{ + u32 i; + + for (i = 0; i < nr_syncobjs; i++) { + if (syncobjs[i]) + drm_syncobj_replace_fence(syncobjs[i], NULL); + } +} + +static void +virtio_gpu_free_post_deps(struct virtio_gpu_submit_post_dep *post_deps, + u32 nr_syncobjs) +{ + u32 i = nr_syncobjs; + + while (i--) { + kfree(post_deps[i].chain); + drm_syncobj_put(post_deps[i].syncobj); + } + + kvfree(post_deps); +} + +static int virtio_gpu_parse_post_deps(struct virtio_gpu_submit *submit) +{ + struct drm_virtgpu_execbuffer *exbuf = submit->exbuf; + struct drm_virtgpu_execbuffer_syncobj syncobj_desc; + struct virtio_gpu_submit_post_dep *post_deps; + u32 num_out_syncobjs = exbuf->num_out_syncobjs; + size_t syncobj_stride = exbuf->syncobj_stride; + int ret = 0, i; + + if (!num_out_syncobjs) + return 0; + + post_deps = kvcalloc(num_out_syncobjs, sizeof(*post_deps), GFP_KERNEL); + if (!post_deps) + return -ENOMEM; + + for (i = 0; i < num_out_syncobjs; i++) { + u64 address = exbuf->out_syncobjs + i * syncobj_stride; + + memset(&syncobj_desc, 0, sizeof(syncobj_desc)); + + if (copy_from_user(&syncobj_desc, + u64_to_user_ptr(address), + min(syncobj_stride, sizeof(syncobj_desc)))) { + ret = -EFAULT; + break; + } + + post_deps[i].point = syncobj_desc.point; + + if (syncobj_desc.flags) { + ret = -EINVAL; + break; + } + + if (syncobj_desc.point) { + post_deps[i].chain = dma_fence_chain_alloc(); + if (!post_deps[i].chain) { + ret = -ENOMEM; + break; + } + } + + post_deps[i].syncobj = drm_syncobj_find(submit->file, + syncobj_desc.handle); + if (!post_deps[i].syncobj) { + kfree(post_deps[i].chain); + ret = -EINVAL; + break; + } + } + + if (ret) { + virtio_gpu_free_post_deps(post_deps, i); + return ret; + } + + submit->num_out_syncobjs = num_out_syncobjs; + submit->post_deps = post_deps; + + return 0; +} + +static void +virtio_gpu_process_post_deps(struct virtio_gpu_submit *submit) +{ + struct virtio_gpu_submit_post_dep *post_deps = submit->post_deps; + struct dma_fence *fence = &submit->out_fence->f; + u32 i; + + for (i = 0; i < submit->num_out_syncobjs; i++) { + if (post_deps[i].chain) { + drm_syncobj_add_point(post_deps[i].syncobj, + post_deps[i].chain, + fence, post_deps[i].point); + post_deps[i].chain = NULL; + } else { + drm_syncobj_replace_fence(post_deps[i].syncobj, fence); + } + } +} + static int virtio_gpu_fence_event_create(struct drm_device *dev, struct drm_file *file, struct virtio_gpu_fence *fence, @@ -122,6 +328,10 @@ static int virtio_gpu_init_submit_buflist(struct virtio_gpu_submit *submit) static void virtio_gpu_cleanup_submit(struct virtio_gpu_submit *submit) { + virtio_gpu_reset_syncobjs(submit->in_syncobjs, submit->num_in_syncobjs); + virtio_gpu_free_syncobjs(submit->in_syncobjs, submit->num_in_syncobjs); + virtio_gpu_free_post_deps(submit->post_deps, submit->num_out_syncobjs); + if (!IS_ERR(submit->buf)) kvfree(submit->buf); @@ -288,6 +498,14 @@ int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, * optimize the path by proceeding directly to the submission * to virtio after the waits. */ + ret = virtio_gpu_parse_post_deps(&submit); + if (ret) + goto cleanup; + + ret = virtio_gpu_parse_deps(&submit); + if (ret) + goto cleanup; + ret = virtio_gpu_wait_in_fence(&submit); if (ret) goto cleanup; @@ -303,6 +521,7 @@ int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, * the job submission path. */ virtio_gpu_install_out_fence_fd(&submit); + virtio_gpu_process_post_deps(&submit); virtio_gpu_complete_submit(&submit); cleanup: virtio_gpu_cleanup_submit(&submit); diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index 7b158fcb02b4..b1d0e56565bc 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -64,6 +64,16 @@ struct drm_virtgpu_map { __u32 pad; }; +#define VIRTGPU_EXECBUF_SYNCOBJ_RESET 0x01 +#define VIRTGPU_EXECBUF_SYNCOBJ_FLAGS ( \ + VIRTGPU_EXECBUF_SYNCOBJ_RESET | \ + 0) +struct drm_virtgpu_execbuffer_syncobj { + __u32 handle; + __u32 flags; + __u64 point; +}; + /* fence_fd is modified on success if VIRTGPU_EXECBUF_FENCE_FD_OUT flag is set. */ struct drm_virtgpu_execbuffer { __u32 flags; @@ -73,7 +83,11 @@ struct drm_virtgpu_execbuffer { __u32 num_bo_handles; __s32 fence_fd; /* in/out fence fd (see VIRTGPU_EXECBUF_FENCE_FD_IN/OUT) */ __u32 ring_idx; /* command ring index (see VIRTGPU_EXECBUF_RING_IDX) */ - __u32 pad; + __u32 syncobj_stride; /* size of @drm_virtgpu_execbuffer_syncobj */ + __u32 num_in_syncobjs; + __u32 num_out_syncobjs; + __u64 in_syncobjs; + __u64 out_syncobjs; }; #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */
Add sync object DRM UAPI support to VirtIO-GPU driver. Sync objects support is needed by native context VirtIO-GPU Mesa drivers, it also will be used by Venus and Virgl contexts. Reviewed-by; Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> --- drivers/gpu/drm/virtio/virtgpu_drv.c | 3 +- drivers/gpu/drm/virtio/virtgpu_submit.c | 219 ++++++++++++++++++++++++ include/uapi/drm/virtgpu_drm.h | 16 +- 3 files changed, 236 insertions(+), 2 deletions(-)