Skip to content

Commit

Permalink
dma-buf: finally make the dma_resv_list private v2
Browse files Browse the repository at this point in the history
Drivers should never touch this directly.

v2: drop kerneldoc for now internal handling

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220321135856.1331-2-christian.koenig@amd.com
  • Loading branch information
Christian König committed Mar 24, 2022
1 parent 548e743 commit 8938d48
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 25 deletions.
11 changes: 11 additions & 0 deletions drivers/dma-buf/dma-resv.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
DEFINE_WD_CLASS(reservation_ww_class);
EXPORT_SYMBOL(reservation_ww_class);

struct dma_resv_list {
struct rcu_head rcu;
u32 shared_count, shared_max;
struct dma_fence __rcu *shared[];
};

/**
* dma_resv_list_alloc - allocate fence list
* @shared_max: number of fences we need space for
Expand Down Expand Up @@ -133,6 +139,11 @@ void dma_resv_fini(struct dma_resv *obj)
}
EXPORT_SYMBOL(dma_resv_fini);

static inline struct dma_resv_list *dma_resv_shared_list(struct dma_resv *obj)
{
return rcu_dereference_check(obj->fence, dma_resv_held(obj));
}

/**
* dma_resv_reserve_shared - Reserve space to add shared fences to
* a dma_resv.
Expand Down
26 changes: 1 addition & 25 deletions include/linux/dma-resv.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,7 @@

extern struct ww_class reservation_ww_class;

/**
* struct dma_resv_list - a list of shared fences
* @rcu: for internal use
* @shared_count: table of shared fences
* @shared_max: for growing shared fence table
* @shared: shared fence table
*/
struct dma_resv_list {
struct rcu_head rcu;
u32 shared_count, shared_max;
struct dma_fence __rcu *shared[];
};
struct dma_resv_list;

/**
* struct dma_resv - a reservation object manages fences for a buffer
Expand Down Expand Up @@ -451,19 +440,6 @@ dma_resv_excl_fence(struct dma_resv *obj)
return rcu_dereference_check(obj->fence_excl, dma_resv_held(obj));
}

/**
* dma_resv_shared_list - get the reservation object's shared fence list
* @obj: the reservation object
*
* Returns the shared fence list. Caller must either hold the objects
* through dma_resv_lock() or the RCU read side lock through rcu_read_lock(),
* or one of the variants of each
*/
static inline struct dma_resv_list *dma_resv_shared_list(struct dma_resv *obj)
{
return rcu_dereference_check(obj->fence, dma_resv_held(obj));
}

void dma_resv_init(struct dma_resv *obj);
void dma_resv_fini(struct dma_resv *obj);
int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences);
Expand Down

0 comments on commit 8938d48

Please sign in to comment.