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
@@ -57,7 +57,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/fence.h>
|
||||
#include <linux/dma-fence.h>
|
||||
|
||||
#include <asm/mman.h>
|
||||
#include <asm/pgalloc.h>
|
||||
@@ -362,7 +362,7 @@ struct drm_ioctl_desc {
|
||||
struct drm_pending_event {
|
||||
struct completion *completion;
|
||||
struct drm_event *event;
|
||||
struct fence *fence;
|
||||
struct dma_fence *fence;
|
||||
struct list_head link;
|
||||
struct list_head pending_link;
|
||||
struct drm_file *file_priv;
|
||||
|
@@ -54,7 +54,7 @@ struct drm_mode_set;
|
||||
struct drm_file;
|
||||
struct drm_clip_rect;
|
||||
struct device_node;
|
||||
struct fence;
|
||||
struct dma_fence;
|
||||
struct edid;
|
||||
|
||||
static inline int64_t U642I64(uint64_t val)
|
||||
|
@@ -59,7 +59,7 @@ struct drm_plane_state {
|
||||
|
||||
struct drm_crtc *crtc; /* do not write directly, use drm_atomic_set_crtc_for_plane() */
|
||||
struct drm_framebuffer *fb; /* do not write directly, use drm_atomic_set_fb_for_plane() */
|
||||
struct fence *fence;
|
||||
struct dma_fence *fence;
|
||||
|
||||
/* Signed dest location allows it to be partially off screen */
|
||||
int32_t crtc_x, crtc_y;
|
||||
|
@@ -209,7 +209,7 @@ struct ttm_buffer_object {
|
||||
* Members protected by a bo reservation.
|
||||
*/
|
||||
|
||||
struct fence *moving;
|
||||
struct dma_fence *moving;
|
||||
|
||||
struct drm_vma_offset_node vma_node;
|
||||
|
||||
|
@@ -303,7 +303,7 @@ struct ttm_mem_type_manager {
|
||||
/*
|
||||
* Protected by @move_lock.
|
||||
*/
|
||||
struct fence *move;
|
||||
struct dma_fence *move;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -1025,7 +1025,7 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
|
||||
*/
|
||||
|
||||
extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
|
||||
struct fence *fence, bool evict,
|
||||
struct dma_fence *fence, bool evict,
|
||||
struct ttm_mem_reg *new_mem);
|
||||
|
||||
/**
|
||||
@@ -1040,7 +1040,7 @@ extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
|
||||
* immediately or hang it on a temporary buffer object.
|
||||
*/
|
||||
int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
|
||||
struct fence *fence, bool evict,
|
||||
struct dma_fence *fence, bool evict,
|
||||
struct ttm_mem_reg *new_mem);
|
||||
|
||||
/**
|
||||
|
@@ -114,6 +114,6 @@ extern int ttm_eu_reserve_buffers(struct ww_acquire_ctx *ticket,
|
||||
|
||||
extern void ttm_eu_fence_buffer_objects(struct ww_acquire_ctx *ticket,
|
||||
struct list_head *list,
|
||||
struct fence *fence);
|
||||
struct dma_fence *fence);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user