Commit 8235eab0 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/virtio: simplify virtio_gpu_alloc_cmd 



Just call virtio_gpu_alloc_cmd_resp with some fixed args
instead of duplicating most of the function body.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200207074638.26386-2-kraxel@redhat.com


Reviewed-by: default avatarChia-I Wu <olvaffe@gmail.com>
parent e59a2508

drivers/gpu/drm/virtio/virtgpu_vq.c

+9 −17
Original line number Diff line number Diff line
@@ -120,23 +120,6 @@ virtio_gpu_vbuf_ctrl_hdr(struct virtio_gpu_vbuffer *vbuf) 
	return (struct virtio_gpu_ctrl_hdr *)vbuf->buf;

}



static void *virtio_gpu_alloc_cmd(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_vbuffer **vbuffer_p,

				  int size)

{

	struct virtio_gpu_vbuffer *vbuf;



	vbuf = virtio_gpu_get_vbuf(vgdev, size,

				   sizeof(struct virtio_gpu_ctrl_hdr),

				   NULL, NULL);

	if (IS_ERR(vbuf)) {

		*vbuffer_p = NULL;

		return ERR_CAST(vbuf);

	}

	*vbuffer_p = vbuf;

	return vbuf->buf;

}



static struct virtio_gpu_update_cursor*

virtio_gpu_alloc_cursor(struct virtio_gpu_device *vgdev,

			struct virtio_gpu_vbuffer **vbuffer_p)
@@ -172,6 +155,15 @@ static void *virtio_gpu_alloc_cmd_resp(struct virtio_gpu_device *vgdev, 
	return (struct virtio_gpu_command *)vbuf->buf;

}



static void *virtio_gpu_alloc_cmd(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_vbuffer **vbuffer_p,

				  int size)

{

	return virtio_gpu_alloc_cmd_resp(vgdev, NULL, vbuffer_p, size,

					 sizeof(struct virtio_gpu_ctrl_hdr),

					 NULL);

}



static void free_vbuf(struct virtio_gpu_device *vgdev,

		      struct virtio_gpu_vbuffer *vbuf)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE