diff mbox series

drm/ttm: some cleanups

Message ID 20200915143055.56565-1-christian.koenig@amd.com
State New, archived
Headers show
Series drm/ttm: some cleanups | expand

Commit Message

Christian König Sept. 15, 2020, 2:30 p.m. UTC
Unexport ttm_check_under_lowerlimit.
Make ttm_bo_acc_size static and unexport it.
Remove ttm_get_kernel_zone_memory_size.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c     |  7 +++----
 drivers/gpu/drm/ttm/ttm_memory.c |  7 -------
 include/drm/ttm/ttm_bo_api.h     | 12 ------------
 include/drm/ttm/ttm_memory.h     |  1 -
 4 files changed, 3 insertions(+), 24 deletions(-)

Comments

Ruhl, Michael J Sept. 15, 2020, 3:44 p.m. UTC | #1
>-----Original Message-----
>From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of
>Christian König
>Sent: Tuesday, September 15, 2020 10:31 AM
>To: dri-devel@lists.freedesktop.org
>Subject: [PATCH] drm/ttm: some cleanups
>
>Unexport ttm_check_under_lowerlimit.
>Make ttm_bo_acc_size static and unexport it.
>Remove ttm_get_kernel_zone_memory_size.
>
>Signed-off-by: Christian König <christian.koenig@amd.com>
>---
> drivers/gpu/drm/ttm/ttm_bo.c     |  7 +++----
> drivers/gpu/drm/ttm/ttm_memory.c |  7 -------
> include/drm/ttm/ttm_bo_api.h     | 12 ------------
> include/drm/ttm/ttm_memory.h     |  1 -
> 4 files changed, 3 insertions(+), 24 deletions(-)
>
>diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>index ee2632128d3c..ffbdc20d8e8d 100644
>--- a/drivers/gpu/drm/ttm/ttm_bo.c
>+++ b/drivers/gpu/drm/ttm/ttm_bo.c
>@@ -1254,9 +1254,9 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
> }
> EXPORT_SYMBOL(ttm_bo_init);
>
>-size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>-		       unsigned long bo_size,
>-		       unsigned struct_size)
>+static size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>+			      unsigned long bo_size,
>+			      unsigned struct_size)
> {
> 	unsigned npages = (PAGE_ALIGN(bo_size)) >> PAGE_SHIFT;
> 	size_t size = 0;
>@@ -1266,7 +1266,6 @@ size_t ttm_bo_acc_size(struct ttm_bo_device
>*bdev,
> 	size += ttm_round_pot(sizeof(struct ttm_tt));
> 	return size;
> }
>-EXPORT_SYMBOL(ttm_bo_acc_size);
>
> size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
> 			   unsigned long bo_size,
>diff --git a/drivers/gpu/drm/ttm/ttm_memory.c
>b/drivers/gpu/drm/ttm/ttm_memory.c
>index acd63b70d814..987aa32c4808 100644
>--- a/drivers/gpu/drm/ttm/ttm_memory.c
>+++ b/drivers/gpu/drm/ttm/ttm_memory.c
>@@ -554,7 +554,6 @@ ttm_check_under_lowerlimit(struct ttm_mem_global
>*glob,
>
> 	return false;
> }
>-EXPORT_SYMBOL(ttm_check_under_lowerlimit);
>
> static int ttm_mem_global_reserve(struct ttm_mem_global *glob,
> 				  struct ttm_mem_zone *single_zone,
>@@ -682,9 +681,3 @@ size_t ttm_round_pot(size_t size)
> 	return 0;
> }
> EXPORT_SYMBOL(ttm_round_pot);
>-
>-uint64_t ttm_get_kernel_zone_memory_size(struct ttm_mem_global *glob)
>-{
>-	return glob->zone_kernel->max_mem;
>-}
>-EXPORT_SYMBOL(ttm_get_kernel_zone_memory_size);
>diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
>index 36ff64e2736c..fd8d29f5f370 100644
>--- a/include/drm/ttm/ttm_bo_api.h
>+++ b/include/drm/ttm/ttm_bo_api.h
>@@ -352,18 +352,6 @@ void ttm_bo_unlock_delayed_workqueue(struct
>ttm_bo_device *bdev, int resched);
> bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
> 			      const struct ttm_place *place);
>
>-/**
>- * ttm_bo_acc_size
>- *
>- * @bdev: Pointer to a ttm_bo_device struct.
>- * @bo_size: size of the buffer object in byte.
>- * @struct_size: size of the structure holding buffer object datas
>- *
>- * Returns size to account for a buffer object
>- */
>-size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>-		       unsigned long bo_size,
>-		       unsigned struct_size);
> size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
> 			   unsigned long bo_size,
> 			   unsigned struct_size);
>diff --git a/include/drm/ttm/ttm_memory.h
>b/include/drm/ttm/ttm_memory.h
>index c78ea99c42cf..2d468d7c94e6 100644
>--- a/include/drm/ttm/ttm_memory.h
>+++ b/include/drm/ttm/ttm_memory.h
>@@ -91,7 +91,6 @@ extern int ttm_mem_global_alloc_page(struct
>ttm_mem_global *glob,
> extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
> 				     struct page *page, uint64_t size);
> extern size_t ttm_round_pot(size_t size);
>-extern uint64_t ttm_get_kernel_zone_memory_size(struct
>ttm_mem_global *glob);
> extern bool ttm_check_under_lowerlimit(struct ttm_mem_global *glob,
> 			uint64_t num_pages, struct ttm_operation_ctx *ctx);
   ^^^^^

Externs for function prototypes have always been a slight mystery to me.
Was this necessary for the EXPORT_SYMBOL?

Since this is now "local" is the extern still needed?

Regardless, I can't resist the low lying fruit...

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>

M


> #endif
>--
>2.17.1
>
>_______________________________________________
>dri-devel mailing list
>dri-devel@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König Sept. 15, 2020, 6:25 p.m. UTC | #2
Am 15.09.20 um 17:44 schrieb Ruhl, Michael J:
>> -----Original Message-----
>> From: dri-devel <dri-devel-bounces@lists.freedesktop.org> On Behalf Of
>> Christian König
>> Sent: Tuesday, September 15, 2020 10:31 AM
>> To: dri-devel@lists.freedesktop.org
>> Subject: [PATCH] drm/ttm: some cleanups
>>
>> Unexport ttm_check_under_lowerlimit.
>> Make ttm_bo_acc_size static and unexport it.
>> Remove ttm_get_kernel_zone_memory_size.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> ---
>> drivers/gpu/drm/ttm/ttm_bo.c     |  7 +++----
>> drivers/gpu/drm/ttm/ttm_memory.c |  7 -------
>> include/drm/ttm/ttm_bo_api.h     | 12 ------------
>> include/drm/ttm/ttm_memory.h     |  1 -
>> 4 files changed, 3 insertions(+), 24 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index ee2632128d3c..ffbdc20d8e8d 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -1254,9 +1254,9 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
>> }
>> EXPORT_SYMBOL(ttm_bo_init);
>>
>> -size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>> -		       unsigned long bo_size,
>> -		       unsigned struct_size)
>> +static size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>> +			      unsigned long bo_size,
>> +			      unsigned struct_size)
>> {
>> 	unsigned npages = (PAGE_ALIGN(bo_size)) >> PAGE_SHIFT;
>> 	size_t size = 0;
>> @@ -1266,7 +1266,6 @@ size_t ttm_bo_acc_size(struct ttm_bo_device
>> *bdev,
>> 	size += ttm_round_pot(sizeof(struct ttm_tt));
>> 	return size;
>> }
>> -EXPORT_SYMBOL(ttm_bo_acc_size);
>>
>> size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
>> 			   unsigned long bo_size,
>> diff --git a/drivers/gpu/drm/ttm/ttm_memory.c
>> b/drivers/gpu/drm/ttm/ttm_memory.c
>> index acd63b70d814..987aa32c4808 100644
>> --- a/drivers/gpu/drm/ttm/ttm_memory.c
>> +++ b/drivers/gpu/drm/ttm/ttm_memory.c
>> @@ -554,7 +554,6 @@ ttm_check_under_lowerlimit(struct ttm_mem_global
>> *glob,
>>
>> 	return false;
>> }
>> -EXPORT_SYMBOL(ttm_check_under_lowerlimit);
>>
>> static int ttm_mem_global_reserve(struct ttm_mem_global *glob,
>> 				  struct ttm_mem_zone *single_zone,
>> @@ -682,9 +681,3 @@ size_t ttm_round_pot(size_t size)
>> 	return 0;
>> }
>> EXPORT_SYMBOL(ttm_round_pot);
>> -
>> -uint64_t ttm_get_kernel_zone_memory_size(struct ttm_mem_global *glob)
>> -{
>> -	return glob->zone_kernel->max_mem;
>> -}
>> -EXPORT_SYMBOL(ttm_get_kernel_zone_memory_size);
>> diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
>> index 36ff64e2736c..fd8d29f5f370 100644
>> --- a/include/drm/ttm/ttm_bo_api.h
>> +++ b/include/drm/ttm/ttm_bo_api.h
>> @@ -352,18 +352,6 @@ void ttm_bo_unlock_delayed_workqueue(struct
>> ttm_bo_device *bdev, int resched);
>> bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
>> 			      const struct ttm_place *place);
>>
>> -/**
>> - * ttm_bo_acc_size
>> - *
>> - * @bdev: Pointer to a ttm_bo_device struct.
>> - * @bo_size: size of the buffer object in byte.
>> - * @struct_size: size of the structure holding buffer object datas
>> - *
>> - * Returns size to account for a buffer object
>> - */
>> -size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>> -		       unsigned long bo_size,
>> -		       unsigned struct_size);
>> size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
>> 			   unsigned long bo_size,
>> 			   unsigned struct_size);
>> diff --git a/include/drm/ttm/ttm_memory.h
>> b/include/drm/ttm/ttm_memory.h
>> index c78ea99c42cf..2d468d7c94e6 100644
>> --- a/include/drm/ttm/ttm_memory.h
>> +++ b/include/drm/ttm/ttm_memory.h
>> @@ -91,7 +91,6 @@ extern int ttm_mem_global_alloc_page(struct
>> ttm_mem_global *glob,
>> extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
>> 				     struct page *page, uint64_t size);
>> extern size_t ttm_round_pot(size_t size);
>> -extern uint64_t ttm_get_kernel_zone_memory_size(struct
>> ttm_mem_global *glob);
>> extern bool ttm_check_under_lowerlimit(struct ttm_mem_global *glob,
>> 			uint64_t num_pages, struct ttm_operation_ctx *ctx);
>     ^^^^^
>
> Externs for function prototypes have always been a slight mystery to me.
> Was this necessary for the EXPORT_SYMBOL?
>
> Since this is now "local" is the extern still needed?

It was never needed in the first place, and yes I'm trying to get rid of 
those for quite some time as well.

Going to remove those in a separate patch.

Thanks,
Christian.

>
> Regardless, I can't resist the low lying fruit...
>
> Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
>
> M
>
>
>> #endif
>> --
>> 2.17.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie Sept. 17, 2020, 6:47 a.m. UTC | #3
Reviewed-by: Dave Airlie <airlied@redhat.com>

On Wed, 16 Sep 2020 at 00:31, Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Unexport ttm_check_under_lowerlimit.
> Make ttm_bo_acc_size static and unexport it.
> Remove ttm_get_kernel_zone_memory_size.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
>  drivers/gpu/drm/ttm/ttm_bo.c     |  7 +++----
>  drivers/gpu/drm/ttm/ttm_memory.c |  7 -------
>  include/drm/ttm/ttm_bo_api.h     | 12 ------------
>  include/drm/ttm/ttm_memory.h     |  1 -
>  4 files changed, 3 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index ee2632128d3c..ffbdc20d8e8d 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1254,9 +1254,9 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
>  }
>  EXPORT_SYMBOL(ttm_bo_init);
>
> -size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
> -                      unsigned long bo_size,
> -                      unsigned struct_size)
> +static size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
> +                             unsigned long bo_size,
> +                             unsigned struct_size)
>  {
>         unsigned npages = (PAGE_ALIGN(bo_size)) >> PAGE_SHIFT;
>         size_t size = 0;
> @@ -1266,7 +1266,6 @@ size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
>         size += ttm_round_pot(sizeof(struct ttm_tt));
>         return size;
>  }
> -EXPORT_SYMBOL(ttm_bo_acc_size);
>
>  size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
>                            unsigned long bo_size,
> diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
> index acd63b70d814..987aa32c4808 100644
> --- a/drivers/gpu/drm/ttm/ttm_memory.c
> +++ b/drivers/gpu/drm/ttm/ttm_memory.c
> @@ -554,7 +554,6 @@ ttm_check_under_lowerlimit(struct ttm_mem_global *glob,
>
>         return false;
>  }
> -EXPORT_SYMBOL(ttm_check_under_lowerlimit);
>
>  static int ttm_mem_global_reserve(struct ttm_mem_global *glob,
>                                   struct ttm_mem_zone *single_zone,
> @@ -682,9 +681,3 @@ size_t ttm_round_pot(size_t size)
>         return 0;
>  }
>  EXPORT_SYMBOL(ttm_round_pot);
> -
> -uint64_t ttm_get_kernel_zone_memory_size(struct ttm_mem_global *glob)
> -{
> -       return glob->zone_kernel->max_mem;
> -}
> -EXPORT_SYMBOL(ttm_get_kernel_zone_memory_size);
> diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
> index 36ff64e2736c..fd8d29f5f370 100644
> --- a/include/drm/ttm/ttm_bo_api.h
> +++ b/include/drm/ttm/ttm_bo_api.h
> @@ -352,18 +352,6 @@ void ttm_bo_unlock_delayed_workqueue(struct ttm_bo_device *bdev, int resched);
>  bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
>                               const struct ttm_place *place);
>
> -/**
> - * ttm_bo_acc_size
> - *
> - * @bdev: Pointer to a ttm_bo_device struct.
> - * @bo_size: size of the buffer object in byte.
> - * @struct_size: size of the structure holding buffer object datas
> - *
> - * Returns size to account for a buffer object
> - */
> -size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
> -                      unsigned long bo_size,
> -                      unsigned struct_size);
>  size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
>                            unsigned long bo_size,
>                            unsigned struct_size);
> diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
> index c78ea99c42cf..2d468d7c94e6 100644
> --- a/include/drm/ttm/ttm_memory.h
> +++ b/include/drm/ttm/ttm_memory.h
> @@ -91,7 +91,6 @@ extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
>  extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
>                                      struct page *page, uint64_t size);
>  extern size_t ttm_round_pot(size_t size);
> -extern uint64_t ttm_get_kernel_zone_memory_size(struct ttm_mem_global *glob);
>  extern bool ttm_check_under_lowerlimit(struct ttm_mem_global *glob,
>                         uint64_t num_pages, struct ttm_operation_ctx *ctx);
>  #endif
> --
> 2.17.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox series

Patch

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index ee2632128d3c..ffbdc20d8e8d 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1254,9 +1254,9 @@  int ttm_bo_init(struct ttm_bo_device *bdev,
 }
 EXPORT_SYMBOL(ttm_bo_init);
 
-size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
-		       unsigned long bo_size,
-		       unsigned struct_size)
+static size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
+			      unsigned long bo_size,
+			      unsigned struct_size)
 {
 	unsigned npages = (PAGE_ALIGN(bo_size)) >> PAGE_SHIFT;
 	size_t size = 0;
@@ -1266,7 +1266,6 @@  size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
 	size += ttm_round_pot(sizeof(struct ttm_tt));
 	return size;
 }
-EXPORT_SYMBOL(ttm_bo_acc_size);
 
 size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
 			   unsigned long bo_size,
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
index acd63b70d814..987aa32c4808 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
@@ -554,7 +554,6 @@  ttm_check_under_lowerlimit(struct ttm_mem_global *glob,
 
 	return false;
 }
-EXPORT_SYMBOL(ttm_check_under_lowerlimit);
 
 static int ttm_mem_global_reserve(struct ttm_mem_global *glob,
 				  struct ttm_mem_zone *single_zone,
@@ -682,9 +681,3 @@  size_t ttm_round_pot(size_t size)
 	return 0;
 }
 EXPORT_SYMBOL(ttm_round_pot);
-
-uint64_t ttm_get_kernel_zone_memory_size(struct ttm_mem_global *glob)
-{
-	return glob->zone_kernel->max_mem;
-}
-EXPORT_SYMBOL(ttm_get_kernel_zone_memory_size);
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 36ff64e2736c..fd8d29f5f370 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -352,18 +352,6 @@  void ttm_bo_unlock_delayed_workqueue(struct ttm_bo_device *bdev, int resched);
 bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
 			      const struct ttm_place *place);
 
-/**
- * ttm_bo_acc_size
- *
- * @bdev: Pointer to a ttm_bo_device struct.
- * @bo_size: size of the buffer object in byte.
- * @struct_size: size of the structure holding buffer object datas
- *
- * Returns size to account for a buffer object
- */
-size_t ttm_bo_acc_size(struct ttm_bo_device *bdev,
-		       unsigned long bo_size,
-		       unsigned struct_size);
 size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev,
 			   unsigned long bo_size,
 			   unsigned struct_size);
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
index c78ea99c42cf..2d468d7c94e6 100644
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
@@ -91,7 +91,6 @@  extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,
 extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,
 				     struct page *page, uint64_t size);
 extern size_t ttm_round_pot(size_t size);
-extern uint64_t ttm_get_kernel_zone_memory_size(struct ttm_mem_global *glob);
 extern bool ttm_check_under_lowerlimit(struct ttm_mem_global *glob,
 			uint64_t num_pages, struct ttm_operation_ctx *ctx);
 #endif