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

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: Gurchetan Singh <gurchetansingh@chromium.org>
Acked-by: Lingfeng Yang <lfy@google.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210921232024.817-8-gurchetansingh@chromium.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 401aec1a5efba6804c04c831eb3997b6c1c16f87..a5142d60c2faadb4a0f788ef2c8386419922a2c9 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -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);

diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c
index d28e25e8409b0ff4e2ecb173bcf93de812163eb6..24c728b65d218814407a92050a9830abf84acd8c 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_fence.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fence.c
@@ -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),

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index f5281d1e30e10dfd2f98c48d9a51f98fd1cc6a59..f51f3393a1946df09f60c4fb9bd5b59ad99e9167 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -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;
 

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index a49fd9480381dfc22ff9ba50ce945e60106260da..6d3cc9e238a4ad2348215933190a293d819a617e 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -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;
        }