mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-25 00:52:45 -04:00
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
@@ -20,7 +20,7 @@
|
||||
#ifndef __LINUX_SEQNO_FENCE_H
|
||||
#define __LINUX_SEQNO_FENCE_H
|
||||
|
||||
#include <linux/fence.h>
|
||||
#include <linux/dma-fence.h>
|
||||
#include <linux/dma-buf.h>
|
||||
|
||||
enum seqno_fence_condition {
|
||||
@@ -29,15 +29,15 @@ enum seqno_fence_condition {
|
||||
};
|
||||
|
||||
struct seqno_fence {
|
||||
struct fence base;
|
||||
struct dma_fence base;
|
||||
|
||||
const struct fence_ops *ops;
|
||||
const struct dma_fence_ops *ops;
|
||||
struct dma_buf *sync_buf;
|
||||
uint32_t seqno_ofs;
|
||||
enum seqno_fence_condition condition;
|
||||
};
|
||||
|
||||
extern const struct fence_ops seqno_fence_ops;
|
||||
extern const struct dma_fence_ops seqno_fence_ops;
|
||||
|
||||
/**
|
||||
* to_seqno_fence - cast a fence to a seqno_fence
|
||||
@@ -47,7 +47,7 @@ extern const struct fence_ops seqno_fence_ops;
|
||||
* or the seqno_fence otherwise.
|
||||
*/
|
||||
static inline struct seqno_fence *
|
||||
to_seqno_fence(struct fence *fence)
|
||||
to_seqno_fence(struct dma_fence *fence)
|
||||
{
|
||||
if (fence->ops != &seqno_fence_ops)
|
||||
return NULL;
|
||||
@@ -83,9 +83,9 @@ to_seqno_fence(struct fence *fence)
|
||||
* dma-buf for sync_buf, since mapping or unmapping the sync_buf to the
|
||||
* device's vm can be expensive.
|
||||
*
|
||||
* It is recommended for creators of seqno_fence to call fence_signal
|
||||
* It is recommended for creators of seqno_fence to call dma_fence_signal()
|
||||
* before destruction. This will prevent possible issues from wraparound at
|
||||
* time of issue vs time of check, since users can check fence_is_signaled
|
||||
* time of issue vs time of check, since users can check dma_fence_is_signaled()
|
||||
* before submitting instructions for the hardware to wait on the fence.
|
||||
* However, when ops.enable_signaling is not called, it doesn't have to be
|
||||
* done as soon as possible, just before there's any real danger of seqno
|
||||
@@ -96,18 +96,18 @@ seqno_fence_init(struct seqno_fence *fence, spinlock_t *lock,
|
||||
struct dma_buf *sync_buf, uint32_t context,
|
||||
uint32_t seqno_ofs, uint32_t seqno,
|
||||
enum seqno_fence_condition cond,
|
||||
const struct fence_ops *ops)
|
||||
const struct dma_fence_ops *ops)
|
||||
{
|
||||
BUG_ON(!fence || !sync_buf || !ops);
|
||||
BUG_ON(!ops->wait || !ops->enable_signaling ||
|
||||
!ops->get_driver_name || !ops->get_timeline_name);
|
||||
|
||||
/*
|
||||
* ops is used in fence_init for get_driver_name, so needs to be
|
||||
* ops is used in dma_fence_init for get_driver_name, so needs to be
|
||||
* initialized first
|
||||
*/
|
||||
fence->ops = ops;
|
||||
fence_init(&fence->base, &seqno_fence_ops, lock, context, seqno);
|
||||
dma_fence_init(&fence->base, &seqno_fence_ops, lock, context, seqno);
|
||||
get_dma_buf(sync_buf);
|
||||
fence->sync_buf = sync_buf;
|
||||
fence->seqno_ofs = seqno_ofs;
|
||||
|
||||
Reference in New Issue
Block a user