Commit 23a0e88e authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/virtio: drop no_wait argument from virtio_gpu_object_reserve 



All callers pass no_wait = false.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarChia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190829103301.3539-6-kraxel@redhat.com
parent 191ab219

drivers/gpu/drm/virtio/virtgpu_drv.h

+2 −3
Original line number Diff line number Diff line
@@ -398,12 +398,11 @@ static inline u64 virtio_gpu_object_mmap_offset(struct virtio_gpu_object *bo) 
	return drm_vma_node_offset_addr(&bo->tbo.base.vma_node);

}



static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo,

					 bool no_wait)

static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)

{

	int r;



	r = ttm_bo_reserve(&bo->tbo, true, no_wait, NULL);

	r = ttm_bo_reserve(&bo->tbo, true, false, NULL);

	if (unlikely(r != 0)) {

		if (r != -ERESTARTSYS) {

			struct virtio_gpu_device *qdev =

drivers/gpu/drm/virtio/virtgpu_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, 
	if (!vgdev->has_virgl_3d)

		return 0;



	r = virtio_gpu_object_reserve(qobj, false);

	r = virtio_gpu_object_reserve(qobj);

	if (r)

		return r;
@@ -163,7 +163,7 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj, 
	if (!vgdev->has_virgl_3d)

		return;



	r = virtio_gpu_object_reserve(qobj, false);

	r = virtio_gpu_object_reserve(qobj);

	if (r)

		return;

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, 


	qobj = gem_to_virtio_gpu_obj(gobj);



	ret = virtio_gpu_object_reserve(qobj, false);

	ret = virtio_gpu_object_reserve(qobj);

	if (ret)

		goto out;
@@ -427,7 +427,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data, 


	qobj = gem_to_virtio_gpu_obj(gobj);



	ret = virtio_gpu_object_reserve(qobj, false);

	ret = virtio_gpu_object_reserve(qobj);

	if (ret)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE