Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1007d22 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Alistair Delva
Browse files

UPSTREAM: drm/virtio: virtio_gpu_cmd_resource_create_3d: drop unused fence arg 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarRobert Foss <robert.foss@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181128151021.29565-3-kraxel@redhat.com


(cherry picked from commit d7a86dffc280cb5a2a18975d46c7b9d89b025c7e)
Signed-off-by: default avatarGreg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: I9f165ce8eb681cd11485da11975a91f1b1571255
parent 1e4ef430

drivers/gpu/drm/virtio/virtgpu_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -324,8 +324,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, 
void

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_resource_create_3d *rc_3d,

				  struct virtio_gpu_fence *fence);

				  struct virtio_gpu_resource_create_3d *rc_3d);

void virtio_gpu_ctrl_ack(struct virtqueue *vq);

void virtio_gpu_cursor_ack(struct virtqueue *vq);

void virtio_gpu_fence_ack(struct virtqueue *vq);

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
			goto fail_backoff;

		}



		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d, NULL);

		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d);

		ret = virtio_gpu_object_attach(vgdev, qobj, fence);

		if (ret) {

			virtio_gpu_fence_cleanup(fence);

drivers/gpu/drm/virtio/virtgpu_vq.c

+2 −3
Original line number Diff line number Diff line
@@ -822,8 +822,7 @@ void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev, 
void

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_resource_create_3d *rc_3d,

				  struct virtio_gpu_fence *fence)

				  struct virtio_gpu_resource_create_3d *rc_3d)

{

	struct virtio_gpu_resource_create_3d *cmd_p;

	struct virtio_gpu_vbuffer *vbuf;
@@ -835,7 +834,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev, 
	cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_CREATE_3D);

	cmd_p->hdr.flags = 0;



	virtio_gpu_queue_fenced_ctrl_buffer(vgdev, vbuf, &cmd_p->hdr, fence);

	virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);

	bo->created = true;

}