dma-buf: Rename struct fence to dma_fence
I plan to usurp the short name of struct fence for a core kernel struct, and so I need to rename the specialised fence/timeline for DMA operations to make room. A consensus was reached in https://lists.freedesktop.org/archives/dri-devel/2016-July/113083.html that making clear this fence applies to DMA operations was a good thing. Since then the patch has grown a bit as usage increases, so hopefully it remains a good thing! (v2...: rebase, rerun spatch) v3: Compile on msm, spotted a manual fixup that I broke. v4: Try again for msm, sorry Daniel coccinelle script: @@ @@ - struct fence + struct dma_fence @@ @@ - struct fence_ops + struct dma_fence_ops @@ @@ - struct fence_cb + struct dma_fence_cb @@ @@ - struct fence_array + struct dma_fence_array @@ @@ - enum fence_flag_bits + enum dma_fence_flag_bits @@ @@ ( - fence_init + dma_fence_init | - fence_release + dma_fence_release | - fence_free + dma_fence_free | - fence_get + dma_fence_get | - fence_get_rcu + dma_fence_get_rcu | - fence_put + dma_fence_put | - fence_signal + dma_fence_signal | - fence_signal_locked + dma_fence_signal_locked | - fence_default_wait + dma_fence_default_wait | - fence_add_callback + dma_fence_add_callback | - fence_remove_callback + dma_fence_remove_callback | - fence_enable_sw_signaling + dma_fence_enable_sw_signaling | - fence_is_signaled_locked + dma_fence_is_signaled_locked | - fence_is_signaled + dma_fence_is_signaled | - fence_is_later + dma_fence_is_later | - fence_later + dma_fence_later | - fence_wait_timeout + dma_fence_wait_timeout | - fence_wait_any_timeout + dma_fence_wait_any_timeout | - fence_wait + dma_fence_wait | - fence_context_alloc + dma_fence_context_alloc | - fence_array_create + dma_fence_array_create | - to_fence_array + to_dma_fence_array | - fence_is_array + dma_fence_is_array | - trace_fence_emit + trace_dma_fence_emit | - FENCE_TRACE + DMA_FENCE_TRACE | - FENCE_WARN + DMA_FENCE_WARN | - FENCE_ERR + DMA_FENCE_ERR ) ( ... ) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Acked-by: Sumit Semwal <sumit.semwal@linaro.org> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161025120045.28839-1-chris@chris-wilson.co.uk
This commit is contained in:

committed by
Daniel Vetter

parent
0fc4f78f44
commit
f54d186700
@@ -26,22 +26,22 @@
|
||||
#include <drm/drmP.h>
|
||||
#include "virtgpu_drv.h"
|
||||
|
||||
static const char *virtio_get_driver_name(struct fence *f)
|
||||
static const char *virtio_get_driver_name(struct dma_fence *f)
|
||||
{
|
||||
return "virtio_gpu";
|
||||
}
|
||||
|
||||
static const char *virtio_get_timeline_name(struct fence *f)
|
||||
static const char *virtio_get_timeline_name(struct dma_fence *f)
|
||||
{
|
||||
return "controlq";
|
||||
}
|
||||
|
||||
static bool virtio_enable_signaling(struct fence *f)
|
||||
static bool virtio_enable_signaling(struct dma_fence *f)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool virtio_signaled(struct fence *f)
|
||||
static bool virtio_signaled(struct dma_fence *f)
|
||||
{
|
||||
struct virtio_gpu_fence *fence = to_virtio_fence(f);
|
||||
|
||||
@@ -50,26 +50,26 @@ static bool virtio_signaled(struct fence *f)
|
||||
return false;
|
||||
}
|
||||
|
||||
static void virtio_fence_value_str(struct fence *f, char *str, int size)
|
||||
static void virtio_fence_value_str(struct dma_fence *f, char *str, int size)
|
||||
{
|
||||
struct virtio_gpu_fence *fence = to_virtio_fence(f);
|
||||
|
||||
snprintf(str, size, "%llu", fence->seq);
|
||||
}
|
||||
|
||||
static void virtio_timeline_value_str(struct fence *f, char *str, int size)
|
||||
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));
|
||||
}
|
||||
|
||||
static const struct fence_ops virtio_fence_ops = {
|
||||
static const struct dma_fence_ops virtio_fence_ops = {
|
||||
.get_driver_name = virtio_get_driver_name,
|
||||
.get_timeline_name = virtio_get_timeline_name,
|
||||
.enable_signaling = virtio_enable_signaling,
|
||||
.signaled = virtio_signaled,
|
||||
.wait = fence_default_wait,
|
||||
.wait = dma_fence_default_wait,
|
||||
.fence_value_str = virtio_fence_value_str,
|
||||
.timeline_value_str = virtio_timeline_value_str,
|
||||
};
|
||||
@@ -88,9 +88,9 @@ int virtio_gpu_fence_emit(struct virtio_gpu_device *vgdev,
|
||||
spin_lock_irqsave(&drv->lock, irq_flags);
|
||||
(*fence)->drv = drv;
|
||||
(*fence)->seq = ++drv->sync_seq;
|
||||
fence_init(&(*fence)->f, &virtio_fence_ops, &drv->lock,
|
||||
drv->context, (*fence)->seq);
|
||||
fence_get(&(*fence)->f);
|
||||
dma_fence_init(&(*fence)->f, &virtio_fence_ops, &drv->lock,
|
||||
drv->context, (*fence)->seq);
|
||||
dma_fence_get(&(*fence)->f);
|
||||
list_add_tail(&(*fence)->node, &drv->fences);
|
||||
spin_unlock_irqrestore(&drv->lock, irq_flags);
|
||||
|
||||
@@ -111,9 +111,9 @@ void virtio_gpu_fence_event_process(struct virtio_gpu_device *vgdev,
|
||||
list_for_each_entry_safe(fence, tmp, &drv->fences, node) {
|
||||
if (last_seq < fence->seq)
|
||||
continue;
|
||||
fence_signal_locked(&fence->f);
|
||||
dma_fence_signal_locked(&fence->f);
|
||||
list_del(&fence->node);
|
||||
fence_put(&fence->f);
|
||||
dma_fence_put(&fence->f);
|
||||
}
|
||||
spin_unlock_irqrestore(&drv->lock, irq_flags);
|
||||
}
|
||||
|
Reference in New Issue
Block a user