diff mbox

[4/4] drm/ttm: move placement structures into ttm_placement.h

Message ID 1473680804-23037-4-git-send-email-deathsimple@vodafone.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christian König Sept. 12, 2016, 11:46 a.m. UTC
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(-)

Comments

Alex Deucher Sept. 12, 2016, 9 p.m. UTC | #1
On Mon, Sep 12, 2016 at 7:46 AM, Christian König
<deathsimple@vodafone.de> 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>

For the series:
Reviewed-by: Alex Deucher <alexander.deucher@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 7641582..932be0c 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.
>   */
> @@ -69,4 +72,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
> --
> 2.5.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chunming Zhou Sept. 13, 2016, 1:57 a.m. UTC | #2
On 2016年09月13日 05:00, Alex Deucher wrote:
> On Mon, Sep 12, 2016 at 7:46 AM, Christian König
> <deathsimple@vodafone.de> 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>
> For the series:
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
The series is ok to me.

Regards,
David Zhou
>
>> ---
>>   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 7641582..932be0c 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.
>>    */
>> @@ -69,4 +72,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
>> --
>> 2.5.0
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

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 7641582..932be0c 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.
  */
@@ -69,4 +72,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