[PATCH 1/2] drm/ttm: Add dummy *populate_and_*map_pages() functions

[PATCH 1/2] drm/ttm: Add dummy *populate_and_*map_pages() functions

[Tom St Denis]

On non IOTLB/IOMMU builds these functions would be undefined.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 include/drm/ttm/ttm_page_alloc.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
index 8695918ea629..4400c08169cd 100644
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
@@ -116,6 +116,16 @@ static inline void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma,
 				      struct device *dev)
 {
 }
+
+static inline int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)
+{
+	return 0;
+}
+
+static inline void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt)
+{
+}
+
 #endif
 
 #endif
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/ttm: Remove needless 'extern' on functions in header.

[Tom St Denis]

Minor tidy up.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 include/drm/ttm/ttm_page_alloc.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
index 4400c08169cd..19bdd907613c 100644
--- a/include/drm/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
@@ -47,7 +47,7 @@ void ttm_page_alloc_fini(void);
  *
  * Add backing pages to all of @ttm
  */
-extern int ttm_pool_populate(struct ttm_tt *ttm);
+int ttm_pool_populate(struct ttm_tt *ttm);
 
 /**
  * ttm_pool_unpopulate:
@@ -56,12 +56,12 @@ extern int ttm_pool_populate(struct ttm_tt *ttm);
  *
  * Free all pages of @ttm
  */
-extern void ttm_pool_unpopulate(struct ttm_tt *ttm);
+void ttm_pool_unpopulate(struct ttm_tt *ttm);
 
 /**
  * Output the state of pools to debugfs file
  */
-extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
+int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
 
 
 #if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)
@@ -78,10 +78,10 @@ void ttm_dma_page_alloc_fini(void);
 /**
  * Output the state of pools to debugfs file
  */
-extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
+int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
 
-extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
-extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
+int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
+void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
 
 
 /**
-- 
2.12.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/ttm: Add dummy *populate_and_*map_pages() functions

[Christian König]

Am 24.08.2017 um 12:48 schrieb Tom St Denis:
> On non IOTLB/IOMMU builds these functions would be undefined.
>
> Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
> ---
>   include/drm/ttm/ttm_page_alloc.h | 10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
> index 8695918ea629..4400c08169cd 100644
> --- a/include/drm/ttm/ttm_page_alloc.h
> +++ b/include/drm/ttm/ttm_page_alloc.h
> @@ -116,6 +116,16 @@ static inline void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma,
>   				      struct device *dev)
>   {
>   }
> +
> +static inline int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)
> +{
> +	return 0;

We should probably return -ENOMEM here, just like the dummy 
ttm_dma_populate() does.

With that fixed the patch is Reviewed-by: Christian König 
<christian.koenig@amd.com>.

Regards,
Christian.

> +}
> +
> +static inline void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt)
> +{
> +}
> +
>   #endif
>   
>   #endif


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/ttm: Remove needless 'extern' on functions in header.

[Christian König]

Am 24.08.2017 um 12:48 schrieb Tom St Denis:
> Minor tidy up.
>
> Signed-off-by: Tom St Denis <tom.stdenis@amd.com>

Thanks and sorry that I thought you added this, I really need more sleep.

Patch is Reviewed-by: Christian König <christian.koenig@amd.com>.

Christian.

> ---
>   include/drm/ttm/ttm_page_alloc.h | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
> index 4400c08169cd..19bdd907613c 100644
> --- a/include/drm/ttm/ttm_page_alloc.h
> +++ b/include/drm/ttm/ttm_page_alloc.h
> @@ -47,7 +47,7 @@ void ttm_page_alloc_fini(void);
>    *
>    * Add backing pages to all of @ttm
>    */
> -extern int ttm_pool_populate(struct ttm_tt *ttm);
> +int ttm_pool_populate(struct ttm_tt *ttm);
>   
>   /**
>    * ttm_pool_unpopulate:
> @@ -56,12 +56,12 @@ extern int ttm_pool_populate(struct ttm_tt *ttm);
>    *
>    * Free all pages of @ttm
>    */
> -extern void ttm_pool_unpopulate(struct ttm_tt *ttm);
> +void ttm_pool_unpopulate(struct ttm_tt *ttm);
>   
>   /**
>    * Output the state of pools to debugfs file
>    */
> -extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
> +int ttm_page_alloc_debugfs(struct seq_file *m, void *data);
>   
>   
>   #if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)
> @@ -78,10 +78,10 @@ void ttm_dma_page_alloc_fini(void);
>   /**
>    * Output the state of pools to debugfs file
>    */
> -extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
> +int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
>   
> -extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
> -extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
> +int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
> +void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
>   
>   
>   /**


_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/ttm: Remove needless 'extern' on functions in header.

[Tom St Denis]

On 24/08/17 07:53 AM, Christian König wrote:
> Am 24.08.2017 um 12:48 schrieb Tom St Denis:
>> Minor tidy up.
>>
>> Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
> 
> Thanks and sorry that I thought you added this, I really need more sleep.
> 
> Patch is Reviewed-by: Christian König <christian.koenig@amd.com>.

No worries.  For a second there I thought I was writing patches too 
early for me :)

Should be an AMD rule that no patches before sun up in the summer... 
Alas in Winter here in Canada that'd cut productivity down to 20% hehehe.

Cheers,
Tom
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel