Commit c76d4ab7 authored by Gurchetan Singh's avatar Gurchetan Singh Committed by Gerd Hoffmann
Browse files

drm/virtio: make virtio_gpu_object_attach void 



It always returns zero.

Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200401223039.2860-4-gurchetansingh@chromium.org


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 6457a0df

drivers/gpu/drm/virtio/virtgpu_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void virtio_gpu_cmd_set_scanout(struct virtio_gpu_device *vgdev, 
				uint32_t scanout_id, uint32_t resource_id,

				uint32_t width, uint32_t height,

				uint32_t x, uint32_t y);

int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,

void virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,

			      struct virtio_gpu_object *obj,

			      struct virtio_gpu_mem_entry *ents,

			      unsigned int nents);

drivers/gpu/drm/virtio/virtgpu_object.c

+1 −5
Original line number Diff line number Diff line
@@ -235,11 +235,7 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, 
		return ret;

	}



	ret = virtio_gpu_object_attach(vgdev, bo, ents, nents);

	if (ret != 0) {

		virtio_gpu_free_object(&shmem_obj->base);

		return ret;

	}

	virtio_gpu_object_attach(vgdev, bo, ents, nents);



	*bo_ptr = bo;

	return 0;

drivers/gpu/drm/virtio/virtgpu_vq.c

+4 −5
Original line number Diff line number Diff line
@@ -1087,14 +1087,13 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev, 
	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, fence);

}



int virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,

void virtio_gpu_object_attach(struct virtio_gpu_device *vgdev,

			      struct virtio_gpu_object *obj,

			      struct virtio_gpu_mem_entry *ents,

			      unsigned int nents)

{

	virtio_gpu_cmd_resource_attach_backing(vgdev, obj->hw_res_handle,

					       ents, nents, NULL);

	return 0;

}



void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE