drm/virtio: move byteorder handling into virtio_gpu_cmd_transfer_to_host_2d function
Subsystems (4)
Gerd Hoffmann
maintainerPATCH 1/1 drm/virtio: move byteorder handling into virtio_gpu_cmd_transfer_to_host_2d function
Be consistent with the rest of the code base.
Signed-off-by Gerd Hoffmann <[email protected]>
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++-- drivers/gpu/drm/virtio/virtgpu_plane.c | 12 ++++++------ drivers/gpu/drm/virtio/virtgpu_vq.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +2 -2
@@ -267,8 +267,8 @@ 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,uint64_t offset, -__le32 width,__le32 height, -__le32 x,__le32 y, +uint32_t width,uint32_t height, +uint32_t x,uint32_t y,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,
drivers/gpu/drm/virtio/virtgpu_plane.c +6 -6
@@ -132,10 +132,10 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d (vgdev,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 ), -cpu_to_le32 (plane->state->src_y >>16 ), + plane->state->src_w >>16 , + plane->state->src_h >>16 , + plane->state->src_x >>16 , + plane->state->src_y >>16 , objs,NULL ); } }else {
@@ -234,8 +234,8 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d (vgdev,0 , -cpu_to_le32 (plane->state->crtc_w), -cpu_to_le32 (plane->state->crtc_h), + plane->state->crtc_w, + plane->state->crtc_h,0 ,0 , objs, vgfb->fence);dma_fence_wait (&vgfb->fence->f, true);dma_fence_put (&vgfb->fence->f);
drivers/gpu/drm/virtio/virtgpu_vq.c +6 -6
@@ -549,8 +549,8 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev,uint64_t offset, -__le32 width,__le32 height, -__le32 x,__le32 y, +uint32_t width,uint32_t height, +uint32_t x,uint32_t y,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -571,10 +571,10 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D ); 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; - cmd_p->r.x = x; - cmd_p->r.y = y; + cmd_p->r.width =cpu_to_le32 (width); + cmd_p->r.height =cpu_to_le32 (height); + cmd_p->r.x =cpu_to_le32 (x); + cmd_p->r.y =cpu_to_le32 (y);virtio_gpu_queue_fenced_ctrl_buffer (vgdev, vbuf, &cmd_p->hdr, fence); }
Signature · 1 line
2.18.1
Quoted 3 lines · Gerd Hoffmann
Be consistent with the rest of the code base.
Signed-off-by Gerd Hoffmann <[email protected]>
Assuming sparse is all still pleased:
Reviewed-by Daniel Vetter <[email protected]>
Quoted 84 lines
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++-- drivers/gpu/drm/virtio/virtgpu_plane.c | 12 ++++++------ drivers/gpu/drm/virtio/virtgpu_vq.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)drivers/gpu/drm/virtio/virtgpu_drv.h +2
-2@@ -267,8 +267,8 @@ 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,uint64_t offset, -__le32 width,__le32 height, -__le32 x,__le32 y, +uint32_t width,uint32_t height, +uint32_t x,uint32_t y,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,drivers/gpu/drm/virtio/virtgpu_plane.c +6
-6@@ -132,10 +132,10 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d (vgdev,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 ), -cpu_to_le32 (plane->state->src_y >>16 ), + plane->state->src_w >>16 , + plane->state->src_h >>16 , + plane->state->src_x >>16 , + plane->state->src_y >>16 , objs,NULL ); } }else {@@ -234,8 +234,8 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d (vgdev,0 , -cpu_to_le32 (plane->state->crtc_w), -cpu_to_le32 (plane->state->crtc_h), + plane->state->crtc_w, + plane->state->crtc_h,0 ,0 , objs, vgfb->fence);dma_fence_wait (&vgfb->fence->f, true);dma_fence_put (&vgfb->fence->f);drivers/gpu/drm/virtio/virtgpu_vq.c +6
-6@@ -549,8 +549,8 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev,uint64_t offset, -__le32 width,__le32 height, -__le32 x,__le32 y, +uint32_t width,uint32_t height, +uint32_t x,uint32_t y,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {@@ -571,10 +571,10 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D ); 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; - cmd_p->r.x = x; - cmd_p->r.y = y; + cmd_p->r.width =cpu_to_le32 (width); + cmd_p->r.height =cpu_to_le32 (height); + cmd_p->r.x =cpu_to_le32 (x); + cmd_p->r.y =cpu_to_le32 (y);virtio_gpu_queue_fenced_ctrl_buffer (vgdev, vbuf, &cmd_p->hdr, fence); }Signature · 1 line
2.18.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 3 lines · Gerd Hoffmann
Be consistent with the rest of the code base.
Signed-off-by Gerd Hoffmann <[email protected]>
Assuming sparse is all still pleased:
Reviewed-by Daniel Vetter <[email protected]>
Quoted 84 lines
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 4 ++-- drivers/gpu/drm/virtio/virtgpu_plane.c | 12 ++++++------ drivers/gpu/drm/virtio/virtgpu_vq.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)drivers/gpu/drm/virtio/virtgpu_drv.h +2
-2@@ -267,8 +267,8 @@ 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,uint64_t offset, -__le32 width,__le32 height, -__le32 x,__le32 y, +uint32_t width,uint32_t height, +uint32_t x,uint32_t y,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence); void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,drivers/gpu/drm/virtio/virtgpu_plane.c +6
-6@@ -132,10 +132,10 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d (vgdev,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 ), -cpu_to_le32 (plane->state->src_y >>16 ), + plane->state->src_w >>16 , + plane->state->src_h >>16 , + plane->state->src_x >>16 , + plane->state->src_y >>16 , objs,NULL ); } }else {@@ -234,8 +234,8 @@ static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,virtio_gpu_array_add_obj (objs, vgfb->base.obj[0 ]);virtio_gpu_cmd_transfer_to_host_2d (vgdev,0 , -cpu_to_le32 (plane->state->crtc_w), -cpu_to_le32 (plane->state->crtc_h), + plane->state->crtc_w, + plane->state->crtc_h,0 ,0 , objs, vgfb->fence);dma_fence_wait (&vgfb->fence->f, true);dma_fence_put (&vgfb->fence->f);drivers/gpu/drm/virtio/virtgpu_vq.c +6
-6@@ -549,8 +549,8 @@ void virtio_gpu_cmd_resource_flush(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_to_host_2d (struct virtio_gpu_device *vgdev,uint64_t offset, -__le32 width,__le32 height, -__le32 x,__le32 y, +uint32_t width,uint32_t height, +uint32_t x,uint32_t y,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {@@ -571,10 +571,10 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D ); 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; - cmd_p->r.x = x; - cmd_p->r.y = y; + cmd_p->r.width =cpu_to_le32 (width); + cmd_p->r.height =cpu_to_le32 (height); + cmd_p->r.x =cpu_to_le32 (x); + cmd_p->r.y =cpu_to_le32 (y);virtio_gpu_queue_fenced_ctrl_buffer (vgdev, vbuf, &cmd_p->hdr, fence); }Signature · 1 line
2.18.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel