| Message ID | 20201119010809.528-4-gurchetansingh@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] drm/virtio: suffix create blob call with _ioctl like any ioctl | expand |
On Wed, Nov 18, 2020 at 05:08:08PM -0800, Gurchetan Singh wrote: >Currently, the fence ID, which can be used to identify a >virtgpu fence, is the same as the fence sequence number. > >Let's use the fence_id name to clearly signal this. > >Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org> Reviewed-by: Anthoine Bourgeois <anthoine.bourgeois@gmail.com> >--- > drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- > drivers/gpu/drm/virtio/virtgpu_fence.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h >index c94052376d18..7c7967a2eb84 100644 >--- a/drivers/gpu/drm/virtio/virtgpu_drv.h >+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h >@@ -420,7 +420,7 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > struct virtio_gpu_ctrl_hdr *cmd_hdr, > struct virtio_gpu_fence *fence); > void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, >- u64 last_seq); >+ u64 fence_id); > > /* virtgpu_object.c */ > void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo); >diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c >index 5b2a4146c5bd..2fe9c7ebcbd4 100644 >--- a/drivers/gpu/drm/virtio/virtgpu_fence.c >+++ b/drivers/gpu/drm/virtio/virtgpu_fence.c >@@ -112,16 +112,16 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, > } > > void virtio_gpu_fence_event_process(struct virtio_gpu_device *vgdev, >- u64 last_seq) >+ u64 fence_id) > { > struct virtio_gpu_fence_driver *drv = &vgdev->fence_drv; > struct virtio_gpu_fence *fence, *tmp; > unsigned long irq_flags; > > spin_lock_irqsave(&drv->lock, irq_flags); >- atomic64_set(&vgdev->fence_drv.last_seq, last_seq); >+ atomic64_set(&vgdev->fence_drv.last_seq, fence_id); > list_for_each_entry_safe(fence, tmp, &drv->fences, node) { >- if (last_seq < fence->f.seqno) >+ if (fence_id < fence->f.seqno) > continue; > dma_fence_signal_locked(&fence->f); > list_del(&fence->node); >-- >2.29.2.299.gdc1121823c-goog >
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h index c94052376d18..7c7967a2eb84 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.h +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h @@ -420,7 +420,7 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, struct virtio_gpu_ctrl_hdr *cmd_hdr, struct virtio_gpu_fence *fence); void virtio_gpu_fence_event_process(struct virtio_gpu_device *vdev, - u64 last_seq); + u64 fence_id); /* virtgpu_object.c */ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo); diff --git a/drivers/gpu/drm/virtio/virtgpu_fence.c b/drivers/gpu/drm/virtio/virtgpu_fence.c index 5b2a4146c5bd..2fe9c7ebcbd4 100644 --- a/drivers/gpu/drm/virtio/virtgpu_fence.c +++ b/drivers/gpu/drm/virtio/virtgpu_fence.c @@ -112,16 +112,16 @@ void virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev, } void virtio_gpu_fence_event_process(struct virtio_gpu_device *vgdev, - u64 last_seq) + u64 fence_id) { struct virtio_gpu_fence_driver *drv = &vgdev->fence_drv; struct virtio_gpu_fence *fence, *tmp; unsigned long irq_flags; spin_lock_irqsave(&drv->lock, irq_flags); - atomic64_set(&vgdev->fence_drv.last_seq, last_seq); + atomic64_set(&vgdev->fence_drv.last_seq, fence_id); list_for_each_entry_safe(fence, tmp, &drv->fences, node) { - if (last_seq < fence->f.seqno) + if (fence_id < fence->f.seqno) continue; dma_fence_signal_locked(&fence->f); list_del(&fence->node);
Currently, the fence ID, which can be used to identify a virtgpu fence, is the same as the fence sequence number. Let's use the fence_id name to clearly signal this. Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org> --- drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_fence.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)