On Wed, 19 Feb 2020 at 17:57, Gurchetan Singh
<gurchetansingh@xxxxxxxxxxxx> wrote:
>
> For old userspace, initialization will still be implicit.
>
> For backwards compatibility, enqueue virtio_gpu_cmd_context_create after
> the first 3D ioctl.
>
> v3: staticify virtio_gpu_create_context
> remove notify to batch vm-exit
>
Similar to 2/5 I suspect we have nested has_virgl_3d checking.
> Signed-off-by: Gurchetan Singh <gurchetansingh@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/virtio/virtgpu_drv.h | 2 --
> drivers/gpu/drm/virtio/virtgpu_ioctl.c | 10 +++++++---
> drivers/gpu/drm/virtio/virtgpu_kms.c | 1 -
> 3 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
> index 0596d9618554..9fdc3b4cef48 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
> @@ -216,8 +216,6 @@ struct virtio_gpu_fpriv {
> /* virtio_ioctl.c */
> #define DRM_VIRTIO_NUM_IOCTLS 10
> extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS];
> -void virtio_gpu_create_context(struct drm_device *dev,
> - struct drm_file *file);
>
> /* virtio_kms.c */
> int virtio_gpu_init(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> index c1a6cb4ec375..2c182922ec78 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> @@ -33,8 +33,8 @@
>
> #include "virtgpu_drv.h"
>
> -void virtio_gpu_create_context(struct drm_device *dev,
> - struct drm_file *file)
> +static void virtio_gpu_create_context(struct drm_device *dev,
> + struct drm_file *file)
> {
In this function...
> struct virtio_gpu_device *vgdev = dev->dev_private;
> struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
> @@ -51,7 +51,6 @@ void virtio_gpu_create_context(struct drm_device *dev,
> get_task_comm(dbgname, current);
> virtio_gpu_cmd_context_create(vgdev, vfpriv->ctx_id,
> strlen(dbgname), dbgname);
> - virtio_gpu_notify(vgdev);
> vfpriv->context_initiated = true;
>
> out_unlock:
> @@ -99,6 +98,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
>
... and this caller, just a couple of lines above.
> exbuf->fence_fd = -1;
>
> + virtio_gpu_create_context(dev, file);
> if (exbuf->flags & VIRTGPU_EXECBUF_FENCE_FD_IN) {
> struct dma_fence *in_fence;
>
> @@ -250,6 +250,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
> return -EINVAL;
> }
>
Unrelated: might be a good idea to sort the has_virgl_3d == false
EINVAL handling like the has_virgl_3d == true hunk just below. Bonus
points for a comment explaining we don't check for the bind and flags
arguments.
> + virtio_gpu_create_context(dev, file);
> params.format = rc->format;
> params.width = rc->width;
> params.height = rc->height;
> @@ -323,6 +324,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
> if (vgdev->has_virgl_3d == false)
> return -ENOSYS;
>
... and this caller.
> + virtio_gpu_create_context(dev, file);
> objs = virtio_gpu_array_from_handles(file, &args->bo_handle, 1);
> if (objs == NULL)
> return -ENOENT;
> @@ -371,6 +373,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
> args->box.w, args->box.h, args->box.x, args->box.y,
> objs, NULL);
> } else {
... and this caller, just a couple of lines above.
With the trivial comments addressed:
Reviewed-by: Emil Velikov <emil.velikov@xxxxxxxxxxxxx>
-Emil
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
