Commit 64f1cc99 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20191018122352.17019-1-kraxel@redhat.com
parent 9e370dfe

drivers/gpu/drm/virtio/virtgpu_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE