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

drm/virtio: implement context init: plumb {base_fence_ctx, ring_idx} to virtio_gpu_fence_alloc 



These were defined in the previous commit. We'll need these
parameters when allocating a dma_fence.  The use case for this
is multiple synchronizations timelines.

The maximum number of timelines per 3D instance will be 32. Usually,
only 2 are needed -- one for CPU commands, and another for GPU
commands.

As such, we'll need to specify these parameters when allocating a
dma_fence.

vgdev->fence_drv.context is the "default" fence context for 2D mode
and old userspace.

Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Acked-by: default avatarLingfeng Yang <lfy@google.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210921232024.817-8-gurchetansingh@chromium.org


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

drivers/gpu/drm/virtio/virtgpu_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -426,8 +426,9 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, 
					int index);



/* virtgpu_fence.c */

struct virtio_gpu_fence *virtio_gpu_fence_alloc(

	struct virtio_gpu_device *vgdev);

struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev,

						uint64_t base_fence_ctx,

						uint32_t ring_idx);

void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev,

			  struct virtio_gpu_ctrl_hdr *cmd_hdr,

			  struct virtio_gpu_fence *fence);

drivers/gpu/drm/virtio/virtgpu_fence.c

+3 −1
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ static const struct dma_fence_ops virtio_gpu_fence_ops = { 
	.timeline_value_str  = virtio_gpu_timeline_value_str,

};



struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev)

struct virtio_gpu_fence *virtio_gpu_fence_alloc(struct virtio_gpu_device *vgdev,

						uint64_t base_fence_ctx,

						uint32_t ring_idx)

{

	struct virtio_gpu_fence_driver *drv = &vgdev->fence_drv;

	struct virtio_gpu_fence *fence = kzalloc(sizeof(struct virtio_gpu_fence),

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+5 −4
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, 
			goto out_memdup;

	}



	out_fence = virtio_gpu_fence_alloc(vgdev);

	out_fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context, 0);

	if(!out_fence) {

		ret = -ENOMEM;

		goto out_unresv;
@@ -288,7 +288,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
	if (params.size == 0)

		params.size = PAGE_SIZE;



	fence = virtio_gpu_fence_alloc(vgdev);

	fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context, 0);

	if (!fence)

		return -ENOMEM;

	ret = virtio_gpu_object_create(vgdev, &params, &qobj, fence);
@@ -367,7 +367,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, 
	if (ret != 0)

		goto err_put_free;



	fence = virtio_gpu_fence_alloc(vgdev);

	fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context, 0);

	if (!fence) {

		ret = -ENOMEM;

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



		ret = -ENOMEM;

		fence = virtio_gpu_fence_alloc(vgdev);

		fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context,

					       0);

		if (!fence)

			goto err_unlock;

drivers/gpu/drm/virtio/virtgpu_plane.c

+2 −1
Original line number Diff line number Diff line
@@ -256,7 +256,8 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane *plane, 
		return 0;



	if (bo->dumb && (plane->state->fb != new_state->fb)) {

		vgfb->fence = virtio_gpu_fence_alloc(vgdev);

		vgfb->fence = virtio_gpu_fence_alloc(vgdev, vgdev->fence_drv.context,

						     0);

		if (!vgfb->fence)

			return -ENOMEM;

	}