Commit 8938d484 authored by Christian König's avatar Christian König
Browse files

dma-buf: finally make the dma_resv_list private v2 



Drivers should never touch this directly.

v2: drop kerneldoc for now internal handling

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220321135856.1331-2-christian.koenig@amd.com
parent 548e7432

drivers/dma-buf/dma-resv.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,12 @@ 
DEFINE_WD_CLASS(reservation_ww_class);

DEFINE_WD_CLASS(reservation_ww_class);

EXPORT_SYMBOL(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

 * dma_resv_list_alloc - allocate fence list

 * @shared_max: number of fences we need space for

 * @shared_max: number of fences we need space for
@@ -133,6 +139,11 @@ void dma_resv_fini(struct dma_resv *obj) 
}

}

EXPORT_SYMBOL(dma_resv_fini);

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

 * dma_resv_reserve_shared - Reserve space to add shared fences to

 * a dma_resv.

 * a dma_resv.

include/linux/dma-resv.h

+1 −25
Original line number Original line Diff line number Diff line
@@ -47,18 +47,7 @@ 




extern struct ww_class reservation_ww_class;

extern struct ww_class reservation_ww_class;





/**

struct dma_resv_list;

 * 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 - a reservation object manages fences for a buffer

 * struct dma_resv - a reservation object manages fences for a buffer
@@ -451,19 +440,6 @@ dma_resv_excl_fence(struct dma_resv *obj) 
	return rcu_dereference_check(obj->fence_excl, dma_resv_held(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_init(struct dma_resv *obj);

void dma_resv_fini(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);

int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences);