| Message ID | 20211207123411.167006-3-christian.koenig@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/24] dma-buf: add dma_resv_replace_fences | expand |
On Tue, Dec 07, 2021 at 01:33:49PM +0100, Christian König wrote: > Drivers should never touch this directly. > > Signed-off-by: Christian König <christian.koenig@amd.com> > --- > drivers/dma-buf/dma-resv.c | 26 ++++++++++++++++++++++++++ > include/linux/dma-resv.h | 26 +------------------------- > 2 files changed, 27 insertions(+), 25 deletions(-) > > diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c > index a688dbded3d3..a12a3a39f280 100644 > --- a/drivers/dma-buf/dma-resv.c > +++ b/drivers/dma-buf/dma-resv.c > @@ -56,6 +56,19 @@ > DEFINE_WD_CLASS(reservation_ww_class); > EXPORT_SYMBOL(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 > + */ Imo drop the kerneldoc here and just make these comments before the right member if you feel like keeping them. Imo it's obvious enough what's going on that the comments aren't necessary, and we don't kerneldoc document internals generally at all - only interfaces relevant by drivers and things outside of a subsystem. > +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 > @@ -133,6 +146,19 @@ void dma_resv_fini(struct dma_resv *obj) > } > EXPORT_SYMBOL(dma_resv_fini); > > +/** > + * 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 > + */ Same here. With that: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > +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. > diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h > index e0be34265eae..3baf2a4a9a0d 100644 > --- a/include/linux/dma-resv.h > +++ b/include/linux/dma-resv.h > @@ -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 > @@ -440,19 +429,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); > -- > 2.25.1 >
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index a688dbded3d3..a12a3a39f280 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -56,6 +56,19 @@ DEFINE_WD_CLASS(reservation_ww_class); EXPORT_SYMBOL(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[]; +}; + /** * dma_resv_list_alloc - allocate fence list * @shared_max: number of fences we need space for @@ -133,6 +146,19 @@ void dma_resv_fini(struct dma_resv *obj) } EXPORT_SYMBOL(dma_resv_fini); +/** + * 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)); +} + /** * dma_resv_reserve_shared - Reserve space to add shared fences to * a dma_resv. diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h index e0be34265eae..3baf2a4a9a0d 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -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 @@ -440,19 +429,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);
Drivers should never touch this directly. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/dma-buf/dma-resv.c | 26 ++++++++++++++++++++++++++ include/linux/dma-resv.h | 26 +------------------------- 2 files changed, 27 insertions(+), 25 deletions(-)