[PATCH 01/11] drm: remove optional dummy function from drivers using TTM

[Daniel Vetter]

On Tue, Jul 21, 2020 at 09:32:35AM +0200, Christian König wrote:
> Implementing those is completely unecessary.
> 
> Signed-off-by: Christian König <christian.koenig at amd.com>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    |  5 -----
>  drivers/gpu/drm/drm_gem_vram_helper.c      |  5 -----
>  drivers/gpu/drm/qxl/qxl_ttm.c              |  6 ------
>  drivers/gpu/drm/radeon/radeon_ttm.c        |  5 -----
>  drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 11 -----------
>  5 files changed, 32 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 3df685287cc1..9c0f12f74af9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -836,10 +836,6 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
>  	return 0;
>  }
>  
> -static void amdgpu_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
> -{
> -}
> -
>  static unsigned long amdgpu_ttm_io_mem_pfn(struct ttm_buffer_object *bo,
>  					   unsigned long page_offset)
>  {
> @@ -1754,7 +1750,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
>  	.release_notify = &amdgpu_bo_release_notify,
>  	.fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
>  	.io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
> -	.io_mem_free = &amdgpu_ttm_io_mem_free,
>  	.io_mem_pfn = amdgpu_ttm_io_mem_pfn,
>  	.access_memory = &amdgpu_ttm_access_memory,
>  	.del_from_lru_notify = &amdgpu_vm_del_from_lru_notify
> diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
> index d107a2679e23..3296ed3df358 100644
> --- a/drivers/gpu/drm/drm_gem_vram_helper.c
> +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
> @@ -1081,10 +1081,6 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev,
>  	return 0;
>  }
>  
> -static void bo_driver_io_mem_free(struct ttm_bo_device *bdev,
> -				  struct ttm_mem_reg *mem)
> -{ }
> -
>  static struct ttm_bo_driver bo_driver = {
>  	.ttm_tt_create = bo_driver_ttm_tt_create,
>  	.ttm_tt_populate = ttm_pool_populate,
> @@ -1094,7 +1090,6 @@ static struct ttm_bo_driver bo_driver = {
>  	.evict_flags = bo_driver_evict_flags,
>  	.move_notify = bo_driver_move_notify,
>  	.io_mem_reserve = bo_driver_io_mem_reserve,
> -	.io_mem_free = bo_driver_io_mem_free,
>  };
>  
>  /*
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index 52eaa2d22745..a6e67149ef4a 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -129,11 +129,6 @@ int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
>  	return 0;
>  }
>  
> -static void qxl_ttm_io_mem_free(struct ttm_bo_device *bdev,
> -				struct ttm_mem_reg *mem)
> -{
> -}
> -
>  /*
>   * TTM backend functions.
>   */
> @@ -247,7 +242,6 @@ static struct ttm_bo_driver qxl_bo_driver = {
>  	.evict_flags = &qxl_evict_flags,
>  	.move = &qxl_bo_move,
>  	.io_mem_reserve = &qxl_ttm_io_mem_reserve,
> -	.io_mem_free = &qxl_ttm_io_mem_free,
>  	.move_notify = &qxl_bo_move_notify,
>  };
>  
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index f4f1e63731a5..73085523fad7 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -457,10 +457,6 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
>  	return 0;
>  }
>  
> -static void radeon_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
> -{
> -}
> -
>  /*
>   * TTM backend functions.
>   */
> @@ -774,7 +770,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
>  	.move_notify = &radeon_bo_move_notify,
>  	.fault_reserve_notify = &radeon_bo_fault_reserve_notify,
>  	.io_mem_reserve = &radeon_ttm_io_mem_reserve,
> -	.io_mem_free = &radeon_ttm_io_mem_free,
>  };
>  
>  int radeon_ttm_init(struct radeon_device *rdev)
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index fbcd11a7b215..bfd0c54ec30a 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -815,15 +815,6 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg
>  	return 0;
>  }
>  
> -static void vmw_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
> -{
> -}
> -
> -static int vmw_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
> -{
> -	return 0;
> -}
> -
>  /**
>   * vmw_move_notify - TTM move_notify_callback
>   *
> @@ -866,7 +857,5 @@ struct ttm_bo_driver vmw_bo_driver = {
>  	.verify_access = vmw_verify_access,
>  	.move_notify = vmw_move_notify,
>  	.swap_notify = vmw_swap_notify,
> -	.fault_reserve_notify = &vmw_ttm_fault_reserve_notify,
>  	.io_mem_reserve = &vmw_ttm_io_mem_reserve,
> -	.io_mem_free = &vmw_ttm_io_mem_free,
>  };
> -- 
> 2.17.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch