On Tue, Jul 02, 2019 at 05:08:46PM -0700, Gurchetan Singh wrote:
> On Tue, Jul 2, 2019 at 7:19 AM Gerd Hoffmann <kraxel@xxxxxxxxxx> wrote:
>
> > Switch to the virtio_gpu_array_* helper workflow.
> >
> > Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> > ---
> > drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++--
> > drivers/gpu/drm/virtio/virtgpu_gem.c | 24 +++++++++++-------------
> > drivers/gpu/drm/virtio/virtgpu_vq.c | 10 ++++++----
> > 3 files changed, 19 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h
> > b/drivers/gpu/drm/virtio/virtgpu_drv.h
> > index b1f63a21abb6..d99c54abd090 100644
> > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
> > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
> > @@ -292,10 +292,10 @@ void virtio_gpu_cmd_context_destroy(struct
> > virtio_gpu_device *vgdev,
> > uint32_t id);
> > void virtio_gpu_cmd_context_attach_resource(struct virtio_gpu_device
> > *vgdev,
> > uint32_t ctx_id,
> > - uint32_t resource_id);
> > + struct virtio_gpu_object_array
> > *objs);
> > void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device
> > *vgdev,
> > uint32_t ctx_id,
> > - uint32_t resource_id);
> > + struct virtio_gpu_object_array
> > *objs);
> > void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,
> > void *data, uint32_t data_size,
> > uint32_t ctx_id,
> > diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c
> > b/drivers/gpu/drm/virtio/virtgpu_gem.c
> > index 6baf64141645..e75819dbba80 100644
> > --- a/drivers/gpu/drm/virtio/virtgpu_gem.c
> > +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
> > @@ -111,19 +111,18 @@ int virtio_gpu_gem_object_open(struct drm_gem_object
> > *obj,
> > {
> > struct virtio_gpu_device *vgdev = obj->dev->dev_private;
> > struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
> > - struct virtio_gpu_object *qobj = gem_to_virtio_gpu_obj(obj);
> > - int r;
> > + struct virtio_gpu_object_array *objs;
> >
> > if (!vgdev->has_virgl_3d)
> > return 0;
> >
> > - r = virtio_gpu_object_reserve(qobj);
> > - if (r)
> > - return r;
> > + objs = virtio_gpu_array_alloc(1);
> > + if (!objs)
> > + return -ENOMEM;
> > + virtio_gpu_array_add_obj(objs, obj);
> >
> > virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id,
> > - qobj->hw_res_handle);
> > - virtio_gpu_object_unreserve(qobj);
> > + objs);
> > return 0;
> > }
> >
> > @@ -132,19 +131,18 @@ void virtio_gpu_gem_object_close(struct
> > drm_gem_object *obj,
> > {
> > struct virtio_gpu_device *vgdev = obj->dev->dev_private;
> > struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
> > - struct virtio_gpu_object *qobj = gem_to_virtio_gpu_obj(obj);
> > - int r;
> > + struct virtio_gpu_object_array *objs;
> >
> > if (!vgdev->has_virgl_3d)
> > return;
> >
> > - r = virtio_gpu_object_reserve(qobj);
> > - if (r)
> > + objs = virtio_gpu_array_alloc(1);
> > + if (!objs)
> > return;
> > + virtio_gpu_array_add_obj(objs, obj);
> >
>
> This seems to call drm_gem_object_get. Without adding the objects to the
> vbuf, aren't we missing the corresponding drm_gem_object_put_unlocked?
Yes. Fixed.
> Some miscellaneous comments:
> 1) Maybe virtio_gpu_array can have it's own header and file? virtgpu_drv.h
> is getting rather big..
Longer-term it might move out anyway due to becoming a generic drm helper.
> 2) What data are you trying to protect with the additional references? Is
> it host side resources (i.e, the host GL texture or buffer object) or is it
> guest side resources (fences)?
Protect the (guest) gem object, specifically make sure the
bo->hw_res_handle stays valid.
cheers,
Gerd
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
