To be clearer about our intentions to differentiate per-context
sequence numbers and fence IDs, let's rename these variables.

Signed-off-by: Gurchetan Singh <gurchetansi...@chromium.org>
---
 drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 ++--
 drivers/gpu/drm/virtio/virtgpu_drv.h     | 4 ++--
 drivers/gpu/drm/virtio/virtgpu_fence.c   | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c 
b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
index e27120d512b0..807fe7e9e4d9 100644
--- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c
+++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
@@ -60,8 +60,8 @@ virtio_gpu_debugfs_irq_info(struct seq_file *m, void *data)
        struct virtio_gpu_device *vgdev = node->minor->dev->dev_private;
 
        seq_printf(m, "fence %llu %lld\n",
-                  (u64)atomic64_read(&vgdev->fence_drv.last_seq),
-                  vgdev->fence_drv.sync_seq);
+                  (u64)atomic64_read(&vgdev->fence_drv.last_fence_id),
+                  vgdev->fence_drv.current_fence_id);
        return 0;
 }
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h 
b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 76223e2aa68d..7d96d0fdcbac 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -98,8 +98,8 @@ typedef void (*virtio_gpu_resp_cb)(struct virtio_gpu_device 
*vgdev,
                                   struct virtio_gpu_vbuffer *vbuf);
 
 struct virtio_gpu_fence_driver {
-       atomic64_t       last_seq;
-       uint64_t         sync_seq;
+       atomic64_t       last_fence_id;
+       uint64_t         current_fence_id;
        uint64_t         context;
        struct list_head fences;
        spinlock_t       lock;
diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c 
b/drivers/gpu/drm/virtio/virtgpu_fence.c
index f0a7ef80e484..0c32f3f72737 100644
--- a/drivers/gpu/drm/virtio/virtgpu_fence.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fence.c
@@ -48,7 +48,7 @@ static bool virtio_fence_signaled(struct dma_fence *f)
                /* leaked fence outside driver before completing
                 * initialization with virtio_gpu_fence_emit */
                return false;
-       if (atomic64_read(&fence->drv->last_seq) >= fence->f.seqno)
+       if (atomic64_read(&fence->drv->last_fence_id) >= fence->f.seqno)
                return true;
        return false;
 }
@@ -62,7 +62,8 @@ static void virtio_timeline_value_str(struct dma_fence *f, 
char *str, int size)
 {
        struct virtio_gpu_fence *fence = to_virtio_fence(f);
 
-       snprintf(str, size, "%llu", (u64)atomic64_read(&fence->drv->last_seq));
+       snprintf(str, size, "%llu",
+               (u64)atomic64_read(&fence->drv->last_fence_id));
 }
 
 static const struct dma_fence_ops virtio_fence_ops = {
@@ -101,7 +102,7 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev,
        unsigned long irq_flags;
 
        spin_lock_irqsave(&drv->lock, irq_flags);
-       fence->f.seqno = ++drv->sync_seq;
+       fence->f.seqno = ++drv->current_fence_id;
        dma_fence_get(&fence->f);
        list_add_tail(&fence->node, &drv->fences);
        spin_unlock_irqrestore(&drv->lock, irq_flags);
@@ -120,7 +121,7 @@ void virtio_gpu_fence_event_process(struct 
virtio_gpu_device *vgdev,
        unsigned long irq_flags;
 
        spin_lock_irqsave(&drv->lock, irq_flags);
-       atomic64_set(&vgdev->fence_drv.last_seq, fence_id);
+       atomic64_set(&vgdev->fence_drv.last_fence_id, fence_id);
        list_for_each_entry_safe(fence, tmp, &drv->fences, node) {
                if (fence_id < fence->f.seqno)
                        continue;
-- 
2.25.1.481.gfbce0eb801-goog

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to