[PATCH v2 4/6] drm/virtio: params struct for virtio_gpu_cmd_create_resource_3d()

[Noralf Trønnes]

Den 30.01.2019 10.43, skrev Gerd Hoffmann:
> Add 3d resource parameters to virtio_gpu_object_params struct.  With
> that in place we can use it for virtio_gpu_cmd_resource_create_3d()
> calls.
> 
> Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
> ---

You don't remove the struct virtio_gpu_resource_create_3d definition,
but it looks like there's no users left?

Noralf.

>  drivers/gpu/drm/virtio/virtgpu_drv.h   | 10 +++++++++-
>  drivers/gpu/drm/virtio/virtgpu_ioctl.c | 25 ++++++++++---------------
>  drivers/gpu/drm/virtio/virtgpu_vq.c    | 16 +++++++++++++---
>  3 files changed, 32 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
> index a40215c10e..3265e62725 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
> @@ -56,6 +56,14 @@ struct virtio_gpu_object_params {
>  	uint32_t height;
>  	unsigned long size;
>  	bool pinned;
> +	/* 3d */
> +	uint32_t target;
> +	uint32_t bind;
> +	uint32_t depth;
> +	uint32_t array_size;
> +	uint32_t last_level;
> +	uint32_t nr_samples;
> +	uint32_t flags;
>  };
>  
>  struct virtio_gpu_object {
> @@ -310,7 +318,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
>  void
>  virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
>  				  struct virtio_gpu_object *bo,
> -				  struct virtio_gpu_resource_create_3d *rc_3d);
> +				  struct virtio_gpu_object_params *params);
>  void virtio_gpu_ctrl_ack(struct virtqueue *vq);
>  void virtio_gpu_cursor_ack(struct virtqueue *vq);
>  void virtio_gpu_fence_ack(struct virtqueue *vq);
> diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> index 84c2216fd4..431e5d767e 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> @@ -283,7 +283,6 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
>  	struct ttm_validate_buffer mainbuf;
>  	struct virtio_gpu_fence *fence = NULL;
>  	struct ww_acquire_ctx ticket;
> -	struct virtio_gpu_resource_create_3d rc_3d;
>  	struct virtio_gpu_object_params params = { 0 };
>  
>  	if (vgdev->has_virgl_3d == false) {
> @@ -307,7 +306,15 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
>  	params.width = rc->width;
>  	params.height = rc->height;
>  	params.size = rc->size;
> -
> +	if (vgdev->has_virgl_3d) {
> +		params.target = rc->target;
> +		params.bind = rc->bind;
> +		params.depth = rc->depth;
> +		params.array_size = rc->array_size;
> +		params.last_level = rc->last_level;
> +		params.nr_samples = rc->nr_samples;
> +		params.flags = rc->flags;
> +	}
>  	/* allocate a single page size object */
>  	if (params.size == 0)
>  		params.size = PAGE_SIZE;
> @@ -333,25 +340,13 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
>  			goto fail_unref;
>  		}
>  
> -		rc_3d.resource_id = cpu_to_le32(qobj->hw_res_handle);
> -		rc_3d.target = cpu_to_le32(rc->target);
> -		rc_3d.format = cpu_to_le32(rc->format);
> -		rc_3d.bind = cpu_to_le32(rc->bind);
> -		rc_3d.width = cpu_to_le32(rc->width);
> -		rc_3d.height = cpu_to_le32(rc->height);
> -		rc_3d.depth = cpu_to_le32(rc->depth);
> -		rc_3d.array_size = cpu_to_le32(rc->array_size);
> -		rc_3d.last_level = cpu_to_le32(rc->last_level);
> -		rc_3d.nr_samples = cpu_to_le32(rc->nr_samples);
> -		rc_3d.flags = cpu_to_le32(rc->flags);
> -
>  		fence = virtio_gpu_fence_alloc(vgdev);
>  		if (!fence) {
>  			ret = -ENOMEM;
>  			goto fail_backoff;
>  		}
>  
> -		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d);
> +		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &params);
>  		ret = virtio_gpu_object_attach(vgdev, qobj, fence);
>  		if (ret) {
>  			dma_fence_put(&fence->f);
> diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
> index 363b8b8577..ca93ec6ca3 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_vq.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
> @@ -826,7 +826,7 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev,
>  void
>  virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
>  				  struct virtio_gpu_object *bo,
> -				  struct virtio_gpu_resource_create_3d *rc_3d)
> +				  struct virtio_gpu_object_params *params)
>  {
>  	struct virtio_gpu_resource_create_3d *cmd_p;
>  	struct virtio_gpu_vbuffer *vbuf;
> @@ -834,9 +834,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
>  	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
>  	memset(cmd_p, 0, sizeof(*cmd_p));
>  
> -	*cmd_p = *rc_3d;
>  	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_CREATE_3D);
> -	cmd_p->hdr.flags = 0;
> +	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
> +	cmd_p->format = cpu_to_le32(params->format);
> +	cmd_p->width = cpu_to_le32(params->width);
> +	cmd_p->height = cpu_to_le32(params->height);
> +
> +	cmd_p->target = cpu_to_le32(params->target);
> +	cmd_p->bind = cpu_to_le32(params->bind);
> +	cmd_p->depth = cpu_to_le32(params->depth);
> +	cmd_p->array_size = cpu_to_le32(params->array_size);
> +	cmd_p->last_level = cpu_to_le32(params->last_level);
> +	cmd_p->nr_samples = cpu_to_le32(params->nr_samples);
> +	cmd_p->flags = cpu_to_le32(params->flags);
>  
>  	virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
>  	bo->created = true;
>