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 <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20191018122352.17019-1-kraxel@redhat.com

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 314e02f94d9c4216edb1904c3be458404c26307e..0b56ba005e253a9101dd2c9bf0d16968b861a3ad 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -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,

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index f4b7360282ce91d589198234df968d7bb237ae51..390524143139b6999a05f3413726780558114e2c 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -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);

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 80176f379ad5115a8fcacaf304afa76f82f36617..74ad3bc3ebe8309a9d601f68e26fbd57663a638e 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -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);
 }