| Message ID | 1473342102-324-2-git-send-email-deathsimple@vodafone.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016年09月08日 21:41, Christian König wrote: > From: Christian König <christian.koenig@amd.com> > > Makes more sense to keep that together. > > Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> > --- > include/drm/ttm/ttm_bo_api.h | 32 +------------------------------- > include/drm/ttm/ttm_placement.h | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+), 31 deletions(-) > > diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h > index 97aaf5c..d73c7c2 100644 > --- a/include/drm/ttm/ttm_bo_api.h > +++ b/include/drm/ttm/ttm_bo_api.h > @@ -45,37 +45,7 @@ struct ttm_bo_device; > > struct drm_mm_node; > > -/** > - * struct ttm_place > - * > - * @fpfn: first valid page frame number to put the object > - * @lpfn: last valid page frame number to put the object > - * @flags: memory domain and caching flags for the object > - * > - * Structure indicating a possible place to put an object. > - */ > -struct ttm_place { > - unsigned fpfn; > - unsigned lpfn; > - uint32_t flags; > -}; > - > -/** > - * struct ttm_placement > - * > - * @num_placement: number of preferred placements > - * @placement: preferred placements > - * @num_busy_placement: number of preferred placements when need to evict buffer > - * @busy_placement: preferred placements when need to evict buffer > - * > - * Structure indicating the placement you request for an object. > - */ > -struct ttm_placement { > - unsigned num_placement; > - const struct ttm_place *placement; > - unsigned num_busy_placement; > - const struct ttm_place *busy_placement; > -}; > +struct ttm_placement; > > /** > * struct ttm_bus_placement > diff --git a/include/drm/ttm/ttm_placement.h b/include/drm/ttm/ttm_placement.h > index 20219d9..ff5195c 100644 > --- a/include/drm/ttm/ttm_placement.h > +++ b/include/drm/ttm/ttm_placement.h > @@ -30,6 +30,9 @@ > > #ifndef _TTM_PLACEMENT_H_ > #define _TTM_PLACEMENT_H_ > + > +#include <linux/types.h> > + > /* > * Memory regions for data placement. > */ > @@ -73,4 +76,36 @@ > > #define TTM_PL_MASK_MEMTYPE (TTM_PL_MASK_MEM | TTM_PL_MASK_CACHING) > > +/** > + * struct ttm_place > + * > + * @fpfn: first valid page frame number to put the object > + * @lpfn: last valid page frame number to put the object > + * @flags: memory domain and caching flags for the object > + * > + * Structure indicating a possible place to put an object. > + */ > +struct ttm_place { > + unsigned fpfn; > + unsigned lpfn; > + uint32_t flags; > +}; > + > +/** > + * struct ttm_placement > + * > + * @num_placement: number of preferred placements > + * @placement: preferred placements > + * @num_busy_placement: number of preferred placements when need to evict buffer > + * @busy_placement: preferred placements when need to evict buffer > + * > + * Structure indicating the placement you request for an object. > + */ > +struct ttm_placement { > + unsigned num_placement; > + const struct ttm_place *placement; > + unsigned num_busy_placement; > + const struct ttm_place *busy_placement; > +}; > + > #endif
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 97aaf5c..d73c7c2 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h @@ -45,37 +45,7 @@ struct ttm_bo_device; struct drm_mm_node; -/** - * struct ttm_place - * - * @fpfn: first valid page frame number to put the object - * @lpfn: last valid page frame number to put the object - * @flags: memory domain and caching flags for the object - * - * Structure indicating a possible place to put an object. - */ -struct ttm_place { - unsigned fpfn; - unsigned lpfn; - uint32_t flags; -}; - -/** - * struct ttm_placement - * - * @num_placement: number of preferred placements - * @placement: preferred placements - * @num_busy_placement: number of preferred placements when need to evict buffer - * @busy_placement: preferred placements when need to evict buffer - * - * Structure indicating the placement you request for an object. - */ -struct ttm_placement { - unsigned num_placement; - const struct ttm_place *placement; - unsigned num_busy_placement; - const struct ttm_place *busy_placement; -}; +struct ttm_placement; /** * struct ttm_bus_placement diff --git a/include/drm/ttm/ttm_placement.h b/include/drm/ttm/ttm_placement.h index 20219d9..ff5195c 100644 --- a/include/drm/ttm/ttm_placement.h +++ b/include/drm/ttm/ttm_placement.h @@ -30,6 +30,9 @@ #ifndef _TTM_PLACEMENT_H_ #define _TTM_PLACEMENT_H_ + +#include <linux/types.h> + /* * Memory regions for data placement. */ @@ -73,4 +76,36 @@ #define TTM_PL_MASK_MEMTYPE (TTM_PL_MASK_MEM | TTM_PL_MASK_CACHING) +/** + * struct ttm_place + * + * @fpfn: first valid page frame number to put the object + * @lpfn: last valid page frame number to put the object + * @flags: memory domain and caching flags for the object + * + * Structure indicating a possible place to put an object. + */ +struct ttm_place { + unsigned fpfn; + unsigned lpfn; + uint32_t flags; +}; + +/** + * struct ttm_placement + * + * @num_placement: number of preferred placements + * @placement: preferred placements + * @num_busy_placement: number of preferred placements when need to evict buffer + * @busy_placement: preferred placements when need to evict buffer + * + * Structure indicating the placement you request for an object. + */ +struct ttm_placement { + unsigned num_placement; + const struct ttm_place *placement; + unsigned num_busy_placement; + const struct ttm_place *busy_placement; +}; + #endif