linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/virtio: pass virtio_gpu_object to virtio_gpu_cmd_transfer_to_host_{2d,3d}
@ 2018-09-20  6:29 Gerd Hoffmann
  2018-09-21  4:53 ` Jiandi An
  0 siblings, 1 reply; 3+ messages in thread
From: Gerd Hoffmann @ 2018-09-20  6:29 UTC (permalink / raw)
  To: dri-devel
  Cc: jiandi, Gerd Hoffmann, David Airlie, open list:VIRTIO GPU DRIVER,
	open list

Pass virtio_gpu_object down to virtio_gpu_cmd_transfer_to_host_2d and
virtio_gpu_cmd_transfer_to_host_3d functions, instead of passing just
the virtio resource handle.

This is needed to lookup the scatter list of the object, for dma sync.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 drivers/gpu/drm/virtio/virtgpu_drv.h   |  6 ++++--
 drivers/gpu/drm/virtio/virtgpu_fb.c    |  2 +-
 drivers/gpu/drm/virtio/virtgpu_ioctl.c |  4 ++--
 drivers/gpu/drm/virtio/virtgpu_plane.c |  4 ++--
 drivers/gpu/drm/virtio/virtgpu_vq.c    | 20 ++++++++------------
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index a2d79e18bd..253fcf018d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -270,7 +270,8 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,
 void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev,
 				   uint32_t resource_id);
 void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
-					uint32_t resource_id, uint64_t offset,
+					struct virtio_gpu_object *bo,
+					uint64_t offset,
 					__le32 width, __le32 height,
 					__le32 x, __le32 y,
 					struct virtio_gpu_fence **fence);
@@ -316,7 +317,8 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,
 					  struct virtio_gpu_box *box,
 					  struct virtio_gpu_fence **fence);
 void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
-					uint32_t resource_id, uint32_t ctx_id,
+					struct virtio_gpu_object *bo,
+					uint32_t ctx_id,
 					uint64_t offset, uint32_t level,
 					struct virtio_gpu_box *box,
 					struct virtio_gpu_fence **fence);
diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
index b9678c4082..3364b0970d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@ -95,7 +95,7 @@ static int virtio_gpu_dirty_update(struct virtio_gpu_framebuffer *fb,
 
 		offset = (y * fb->base.pitches[0]) + x * bpp;
 
-		virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj->hw_res_handle,
+		virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj,
 						   offset,
 						   cpu_to_le32(w),
 						   cpu_to_le32(h),
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 7bdf6f0e58..f16b875d6a 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -429,11 +429,11 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
 	convert_to_hw_box(&box, &args->box);
 	if (!vgdev->has_virgl_3d) {
 		virtio_gpu_cmd_transfer_to_host_2d
-			(vgdev, qobj->hw_res_handle, offset,
+			(vgdev, qobj, offset,
 			 box.w, box.h, box.x, box.y, NULL);
 	} else {
 		virtio_gpu_cmd_transfer_to_host_3d
-			(vgdev, qobj->hw_res_handle,
+			(vgdev, qobj,
 			 vfpriv ? vfpriv->ctx_id : 0, offset,
 			 args->level, &box, &fence);
 		reservation_object_add_excl_fence(qobj->tbo.resv,
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 88f2fb8c61..682a977d68 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -158,7 +158,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
 		handle = bo->hw_res_handle;
 		if (bo->dumb) {
 			virtio_gpu_cmd_transfer_to_host_2d
-				(vgdev, handle, 0,
+				(vgdev, bo, 0,
 				 cpu_to_le32(plane->state->src_w >> 16),
 				 cpu_to_le32(plane->state->src_h >> 16),
 				 cpu_to_le32(plane->state->src_x >> 16),
@@ -217,7 +217,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
 	if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {
 		/* new cursor -- update & wait */
 		virtio_gpu_cmd_transfer_to_host_2d
-			(vgdev, handle, 0,
+			(vgdev, bo, 0,
 			 cpu_to_le32(plane->state->crtc_w),
 			 cpu_to_le32(plane->state->crtc_h),
 			 0, 0, &fence);
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index df32811f2c..4e2e037aed 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -483,28 +483,26 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,
 }
 
 void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
-					uint32_t resource_id, uint64_t offset,
+					struct virtio_gpu_object *bo,
+					uint64_t offset,
 					__le32 width, __le32 height,
 					__le32 x, __le32 y,
 					struct virtio_gpu_fence **fence)
 {
 	struct virtio_gpu_transfer_to_host_2d *cmd_p;
 	struct virtio_gpu_vbuffer *vbuf;
-	struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
-	struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
-	struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
 	bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
 
 	if (use_dma_api)
 		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
-				       obj->pages->sgl, obj->pages->nents,
+				       bo->pages->sgl, bo->pages->nents,
 				       DMA_TO_DEVICE);
 
 	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
 	memset(cmd_p, 0, sizeof(*cmd_p));
 
 	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D);
-	cmd_p->resource_id = cpu_to_le32(resource_id);
+	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
 	cmd_p->offset = cpu_to_le64(offset);
 	cmd_p->r.width = width;
 	cmd_p->r.height = height;
@@ -791,21 +789,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
 }
 
 void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
-					uint32_t resource_id, uint32_t ctx_id,
+					struct virtio_gpu_object *bo,
+					uint32_t ctx_id,
 					uint64_t offset, uint32_t level,
 					struct virtio_gpu_box *box,
 					struct virtio_gpu_fence **fence)
 {
 	struct virtio_gpu_transfer_host_3d *cmd_p;
 	struct virtio_gpu_vbuffer *vbuf;
-	struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
-	struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
-	struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
 	bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
 
 	if (use_dma_api)
 		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
-				       obj->pages->sgl, obj->pages->nents,
+				       bo->pages->sgl, bo->pages->nents,
 				       DMA_TO_DEVICE);
 
 	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
@@ -813,7 +809,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
 
 	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D);
 	cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
-	cmd_p->resource_id = cpu_to_le32(resource_id);
+	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
 	cmd_p->box = *box;
 	cmd_p->offset = cpu_to_le64(offset);
 	cmd_p->level = cpu_to_le32(level);
-- 
2.9.3


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/virtio: pass virtio_gpu_object to virtio_gpu_cmd_transfer_to_host_{2d,3d}
  2018-09-20  6:29 [PATCH] drm/virtio: pass virtio_gpu_object to virtio_gpu_cmd_transfer_to_host_{2d,3d} Gerd Hoffmann
@ 2018-09-21  4:53 ` Jiandi An
  2018-09-21 17:32   ` An, Jiandi
  0 siblings, 1 reply; 3+ messages in thread
From: Jiandi An @ 2018-09-21  4:53 UTC (permalink / raw)
  To: Gerd Hoffmann, dri-devel
  Cc: David Airlie, open list:VIRTIO GPU DRIVER, open list



On 09/20/2018 01:29 AM, Gerd Hoffmann wrote:
> Pass virtio_gpu_object down to virtio_gpu_cmd_transfer_to_host_2d and
> virtio_gpu_cmd_transfer_to_host_3d functions, instead of passing just
> the virtio resource handle.
> 
> This is needed to lookup the scatter list of the object, for dma sync.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Tested-by: Jiandi An <jiandi.an@amd.com>




































































































> ---
>  drivers/gpu/drm/virtio/virtgpu_drv.h   |  6 ++++--
>  drivers/gpu/drm/virtio/virtgpu_fb.c    |  2 +-
>  drivers/gpu/drm/virtio/virtgpu_ioctl.c |  4 ++--
>  drivers/gpu/drm/virtio/virtgpu_plane.c |  4 ++--
>  drivers/gpu/drm/virtio/virtgpu_vq.c    | 20 ++++++++------------
>  5 files changed, 17 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
> index a2d79e18bd..253fcf018d 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
> @@ -270,7 +270,8 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,
>  void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev,
>  				   uint32_t resource_id);
>  void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
> -					uint32_t resource_id, uint64_t offset,
> +					struct virtio_gpu_object *bo,
> +					uint64_t offset,
>  					__le32 width, __le32 height,
>  					__le32 x, __le32 y,
>  					struct virtio_gpu_fence **fence);
> @@ -316,7 +317,8 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,
>  					  struct virtio_gpu_box *box,
>  					  struct virtio_gpu_fence **fence);
>  void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
> -					uint32_t resource_id, uint32_t ctx_id,
> +					struct virtio_gpu_object *bo,
> +					uint32_t ctx_id,
>  					uint64_t offset, uint32_t level,
>  					struct virtio_gpu_box *box,
>  					struct virtio_gpu_fence **fence);
> diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
> index b9678c4082..3364b0970d 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_fb.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
> @@ -95,7 +95,7 @@ static int virtio_gpu_dirty_update(struct virtio_gpu_framebuffer *fb,
>  
>  		offset = (y * fb->base.pitches[0]) + x * bpp;
>  
> -		virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj->hw_res_handle,
> +		virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj,
>  						   offset,
>  						   cpu_to_le32(w),
>  						   cpu_to_le32(h),
> diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> index 7bdf6f0e58..f16b875d6a 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
> @@ -429,11 +429,11 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
>  	convert_to_hw_box(&box, &args->box);
>  	if (!vgdev->has_virgl_3d) {
>  		virtio_gpu_cmd_transfer_to_host_2d
> -			(vgdev, qobj->hw_res_handle, offset,
> +			(vgdev, qobj, offset,
>  			 box.w, box.h, box.x, box.y, NULL);
>  	} else {
>  		virtio_gpu_cmd_transfer_to_host_3d
> -			(vgdev, qobj->hw_res_handle,
> +			(vgdev, qobj,
>  			 vfpriv ? vfpriv->ctx_id : 0, offset,
>  			 args->level, &box, &fence);
>  		reservation_object_add_excl_fence(qobj->tbo.resv,
> diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
> index 88f2fb8c61..682a977d68 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_plane.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
> @@ -158,7 +158,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
>  		handle = bo->hw_res_handle;
>  		if (bo->dumb) {
>  			virtio_gpu_cmd_transfer_to_host_2d
> -				(vgdev, handle, 0,
> +				(vgdev, bo, 0,
>  				 cpu_to_le32(plane->state->src_w >> 16),
>  				 cpu_to_le32(plane->state->src_h >> 16),
>  				 cpu_to_le32(plane->state->src_x >> 16),
> @@ -217,7 +217,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
>  	if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {
>  		/* new cursor -- update & wait */
>  		virtio_gpu_cmd_transfer_to_host_2d
> -			(vgdev, handle, 0,
> +			(vgdev, bo, 0,
>  			 cpu_to_le32(plane->state->crtc_w),
>  			 cpu_to_le32(plane->state->crtc_h),
>  			 0, 0, &fence);
> diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
> index df32811f2c..4e2e037aed 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_vq.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
> @@ -483,28 +483,26 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,
>  }
>  
>  void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
> -					uint32_t resource_id, uint64_t offset,
> +					struct virtio_gpu_object *bo,
> +					uint64_t offset,
>  					__le32 width, __le32 height,
>  					__le32 x, __le32 y,
>  					struct virtio_gpu_fence **fence)
>  {
>  	struct virtio_gpu_transfer_to_host_2d *cmd_p;
>  	struct virtio_gpu_vbuffer *vbuf;
> -	struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
> -	struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
> -	struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
>  	bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
>  
>  	if (use_dma_api)
>  		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
> -				       obj->pages->sgl, obj->pages->nents,
> +				       bo->pages->sgl, bo->pages->nents,
>  				       DMA_TO_DEVICE);
>  
>  	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
>  	memset(cmd_p, 0, sizeof(*cmd_p));
>  
>  	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D);
> -	cmd_p->resource_id = cpu_to_le32(resource_id);
> +	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
>  	cmd_p->offset = cpu_to_le64(offset);
>  	cmd_p->r.width = width;
>  	cmd_p->r.height = height;
> @@ -791,21 +789,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
>  }
>  
>  void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
> -					uint32_t resource_id, uint32_t ctx_id,
> +					struct virtio_gpu_object *bo,
> +					uint32_t ctx_id,
>  					uint64_t offset, uint32_t level,
>  					struct virtio_gpu_box *box,
>  					struct virtio_gpu_fence **fence)
>  {
>  	struct virtio_gpu_transfer_host_3d *cmd_p;
>  	struct virtio_gpu_vbuffer *vbuf;
> -	struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
> -	struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
> -	struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
>  	bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
>  
>  	if (use_dma_api)
>  		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
> -				       obj->pages->sgl, obj->pages->nents,
> +				       bo->pages->sgl, bo->pages->nents,
>  				       DMA_TO_DEVICE);
>  
>  	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
> @@ -813,7 +809,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
>  
>  	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D);
>  	cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
> -	cmd_p->resource_id = cpu_to_le32(resource_id);
> +	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
>  	cmd_p->box = *box;
>  	cmd_p->offset = cpu_to_le64(offset);
>  	cmd_p->level = cpu_to_le32(level);
> 
































































^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/virtio: pass virtio_gpu_object to virtio_gpu_cmd_transfer_to_host_{2d,3d}
  2018-09-21  4:53 ` Jiandi An
@ 2018-09-21 17:32   ` An, Jiandi
  0 siblings, 0 replies; 3+ messages in thread
From: An, Jiandi @ 2018-09-21 17:32 UTC (permalink / raw)
  To: An, Jiandi, Gerd Hoffmann, dri-devel
  Cc: David Airlie, open list:VIRTIO GPU DRIVER, open list



On 09/20/2018 11:53 PM, Jiandi An wrote:
> 
> 
> On 09/20/2018 01:29 AM, Gerd Hoffmann wrote:
>> Pass virtio_gpu_object down to virtio_gpu_cmd_transfer_to_host_2d and
>> virtio_gpu_cmd_transfer_to_host_3d functions, instead of passing just
>> the virtio resource handle.
>>
>> This is needed to lookup the scatter list of the object, for dma sync.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> Tested-by: Jiandi An <jiandi.an@amd.com>
Reviewed-by: Jiandi An <jiandi.an@amd.com>
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
>> ---
>>  drivers/gpu/drm/virtio/virtgpu_drv.h   |  6 ++++--
>>  drivers/gpu/drm/virtio/virtgpu_fb.c    |  2 +-
>>  drivers/gpu/drm/virtio/virtgpu_ioctl.c |  4 ++--
>>  drivers/gpu/drm/virtio/virtgpu_plane.c |  4 ++--
>>  drivers/gpu/drm/virtio/virtgpu_vq.c    | 20 ++++++++------------
>>  5 files changed, 17 insertions(+), 19 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
>> index a2d79e18bd..253fcf018d 100644
>> --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
>> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
>> @@ -270,7 +270,8 @@ void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,
>>  void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev,
>>  				   uint32_t resource_id);
>>  void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
>> -					uint32_t resource_id, uint64_t offset,
>> +					struct virtio_gpu_object *bo,
>> +					uint64_t offset,
>>  					__le32 width, __le32 height,
>>  					__le32 x, __le32 y,
>>  					struct virtio_gpu_fence **fence);
>> @@ -316,7 +317,8 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev,
>>  					  struct virtio_gpu_box *box,
>>  					  struct virtio_gpu_fence **fence);
>>  void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
>> -					uint32_t resource_id, uint32_t ctx_id,
>> +					struct virtio_gpu_object *bo,
>> +					uint32_t ctx_id,
>>  					uint64_t offset, uint32_t level,
>>  					struct virtio_gpu_box *box,
>>  					struct virtio_gpu_fence **fence);
>> diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
>> index b9678c4082..3364b0970d 100644
>> --- a/drivers/gpu/drm/virtio/virtgpu_fb.c
>> +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
>> @@ -95,7 +95,7 @@ static int virtio_gpu_dirty_update(struct virtio_gpu_framebuffer *fb,
>>  
>>  		offset = (y * fb->base.pitches[0]) + x * bpp;
>>  
>> -		virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj->hw_res_handle,
>> +		virtio_gpu_cmd_transfer_to_host_2d(vgdev, obj,
>>  						   offset,
>>  						   cpu_to_le32(w),
>>  						   cpu_to_le32(h),
>> diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
>> index 7bdf6f0e58..f16b875d6a 100644
>> --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
>> +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
>> @@ -429,11 +429,11 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
>>  	convert_to_hw_box(&box, &args->box);
>>  	if (!vgdev->has_virgl_3d) {
>>  		virtio_gpu_cmd_transfer_to_host_2d
>> -			(vgdev, qobj->hw_res_handle, offset,
>> +			(vgdev, qobj, offset,
>>  			 box.w, box.h, box.x, box.y, NULL);
>>  	} else {
>>  		virtio_gpu_cmd_transfer_to_host_3d
>> -			(vgdev, qobj->hw_res_handle,
>> +			(vgdev, qobj,
>>  			 vfpriv ? vfpriv->ctx_id : 0, offset,
>>  			 args->level, &box, &fence);
>>  		reservation_object_add_excl_fence(qobj->tbo.resv,
>> diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
>> index 88f2fb8c61..682a977d68 100644
>> --- a/drivers/gpu/drm/virtio/virtgpu_plane.c
>> +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
>> @@ -158,7 +158,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
>>  		handle = bo->hw_res_handle;
>>  		if (bo->dumb) {
>>  			virtio_gpu_cmd_transfer_to_host_2d
>> -				(vgdev, handle, 0,
>> +				(vgdev, bo, 0,
>>  				 cpu_to_le32(plane->state->src_w >> 16),
>>  				 cpu_to_le32(plane->state->src_h >> 16),
>>  				 cpu_to_le32(plane->state->src_x >> 16),
>> @@ -217,7 +217,7 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,
>>  	if (bo && bo->dumb && (plane->state->fb != old_state->fb)) {
>>  		/* new cursor -- update & wait */
>>  		virtio_gpu_cmd_transfer_to_host_2d
>> -			(vgdev, handle, 0,
>> +			(vgdev, bo, 0,
>>  			 cpu_to_le32(plane->state->crtc_w),
>>  			 cpu_to_le32(plane->state->crtc_h),
>>  			 0, 0, &fence);
>> diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
>> index df32811f2c..4e2e037aed 100644
>> --- a/drivers/gpu/drm/virtio/virtgpu_vq.c
>> +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
>> @@ -483,28 +483,26 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,
>>  }
>>  
>>  void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev,
>> -					uint32_t resource_id, uint64_t offset,
>> +					struct virtio_gpu_object *bo,
>> +					uint64_t offset,
>>  					__le32 width, __le32 height,
>>  					__le32 x, __le32 y,
>>  					struct virtio_gpu_fence **fence)
>>  {
>>  	struct virtio_gpu_transfer_to_host_2d *cmd_p;
>>  	struct virtio_gpu_vbuffer *vbuf;
>> -	struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
>> -	struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
>> -	struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
>>  	bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
>>  
>>  	if (use_dma_api)
>>  		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
>> -				       obj->pages->sgl, obj->pages->nents,
>> +				       bo->pages->sgl, bo->pages->nents,
>>  				       DMA_TO_DEVICE);
>>  
>>  	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
>>  	memset(cmd_p, 0, sizeof(*cmd_p));
>>  
>>  	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D);
>> -	cmd_p->resource_id = cpu_to_le32(resource_id);
>> +	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
>>  	cmd_p->offset = cpu_to_le64(offset);
>>  	cmd_p->r.width = width;
>>  	cmd_p->r.height = height;
>> @@ -791,21 +789,19 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,
>>  }
>>  
>>  void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
>> -					uint32_t resource_id, uint32_t ctx_id,
>> +					struct virtio_gpu_object *bo,
>> +					uint32_t ctx_id,
>>  					uint64_t offset, uint32_t level,
>>  					struct virtio_gpu_box *box,
>>  					struct virtio_gpu_fence **fence)
>>  {
>>  	struct virtio_gpu_transfer_host_3d *cmd_p;
>>  	struct virtio_gpu_vbuffer *vbuf;
>> -	struct virtio_gpu_fbdev *vgfbdev = vgdev->vgfbdev;
>> -	struct virtio_gpu_framebuffer *fb = &vgfbdev->vgfb;
>> -	struct virtio_gpu_object *obj = gem_to_virtio_gpu_obj(fb->base.obj[0]);
>>  	bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev);
>>  
>>  	if (use_dma_api)
>>  		dma_sync_sg_for_device(vgdev->vdev->dev.parent,
>> -				       obj->pages->sgl, obj->pages->nents,
>> +				       bo->pages->sgl, bo->pages->nents,
>>  				       DMA_TO_DEVICE);
>>  
>>  	cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
>> @@ -813,7 +809,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,
>>  
>>  	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D);
>>  	cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
>> -	cmd_p->resource_id = cpu_to_le32(resource_id);
>> +	cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
>>  	cmd_p->box = *box;
>>  	cmd_p->offset = cpu_to_le64(offset);
>>  	cmd_p->level = cpu_to_le32(level);
>>
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-21 17:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-20  6:29 [PATCH] drm/virtio: pass virtio_gpu_object to virtio_gpu_cmd_transfer_to_host_{2d,3d} Gerd Hoffmann
2018-09-21  4:53 ` Jiandi An
2018-09-21 17:32   ` An, Jiandi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).