Re: [PATCH 53/59] drm/ttm: drop man->bdev link.

2020-08-04 Thread Ben Skeggs 
On Tue, 4 Aug 2020 at 12:58, Dave Airlie  wrote:
>
> From: Dave Airlie 
>
> This link isn't needed anymore, drop it from the init interface.
>
> Signed-off-by: Dave Airlie 
Reviewed-by: Ben Skeggs 

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 2 +-
>  drivers/gpu/drm/nouveau/nouveau_ttm.c | 6 ++
>  drivers/gpu/drm/ttm/ttm_bo.c  | 6 ++
>  drivers/gpu/drm/ttm/ttm_bo_manager.c  | 2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_thp.c   | 2 +-
>  include/drm/ttm/ttm_bo_api.h  | 6 ++
>  include/drm/ttm/ttm_bo_driver.h   | 2 --
>  9 files changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> index b664c5cb13ce..9fc3d876ed38 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> @@ -108,7 +108,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, 
> uint64_t gtt_size)
> man->available_caching = TTM_PL_MASK_CACHING;
> man->default_caching = TTM_PL_FLAG_CACHED;
>
> -   ttm_mem_type_manager_init(>mman.bdev, man, gtt_size >> 
> PAGE_SHIFT);
> +   ttm_mem_type_manager_init(man, gtt_size >> PAGE_SHIFT);
>
> start = AMDGPU_GTT_MAX_TRANSFER_SIZE * 
> AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
> size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> index bbc528c0ed3e..684698cdf772 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> @@ -190,7 +190,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
> man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
> man->default_caching = TTM_PL_FLAG_WC;
>
> -   ttm_mem_type_manager_init(>mman.bdev, man, 
> adev->gmc.real_vram_size >> PAGE_SHIFT);
> +   ttm_mem_type_manager_init(man, adev->gmc.real_vram_size >> 
> PAGE_SHIFT);
>
> man->func = _vram_mgr_func;
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c 
> b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> index 58d9bd708e95..d408e1485cce 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
> @@ -175,7 +175,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
> man->func = _vram_manager;
> man->use_io_reserve_lru = true;
>
> -   ttm_mem_type_manager_init(>ttm.bdev, man,
> +   ttm_mem_type_manager_init(man,
>   drm->gem.vram_available >> 
> PAGE_SHIFT);
> ttm_set_driver_manager(>ttm.bdev, TTM_PL_VRAM, man);
> ttm_mem_type_manager_set_used(man, true);
> @@ -237,9 +237,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
> man->available_caching = available_caching;
> man->default_caching = default_caching;
> man->use_tt = true;
> -   ttm_mem_type_manager_init(>ttm.bdev, man,
> - size_pages);
> -
> +   ttm_mem_type_manager_init(man, size_pages);
> ttm_set_driver_manager(>ttm.bdev, TTM_PL_TT, man);
> ttm_mem_type_manager_set_used(man, true);
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 3a3a4dfb0fff..78b72443a9ef 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1471,8 +1471,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, 
> unsigned mem_type)
>  }
>  EXPORT_SYMBOL(ttm_bo_evict_mm);
>
> -void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
> -  struct ttm_mem_type_manager *man,
> +void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
>unsigned long p_size)
>  {
> unsigned i;
> @@ -1482,7 +1481,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device 
> *bdev,
> mutex_init(>io_reserve_mutex);
> spin_lock_init(>move_lock);
> INIT_LIST_HEAD(>io_reserve_lru);
> -   man->bdev = bdev;
> man->size = p_size;
>
> for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
> @@ -1595,7 +1593,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device 
> *bdev)
> man->available_caching = TTM_PL_MASK_CACHING;
> man->default_caching = TTM_PL_FLAG_CACHED;
>
> -   ttm_mem_type_manager_init(bdev, man, 0);
> +   ttm_mem_type_manager_init(man, 0);
> ttm_mem_type_manager_set_used(man, true);
>  }
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c 
> b/drivers/gpu/drm/ttm/ttm_bo_manager.c
> index 01d41c6f2f7b..1b7245ce3356 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
> @@ -133,7 +133,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
>
>

[PATCH 53/59] drm/ttm: drop man->bdev link.

2020-08-03 Thread Dave Airlie 
From: Dave Airlie 

This link isn't needed anymore, drop it from the init interface.

Signed-off-by: Dave Airlie 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 2 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 6 ++
 drivers/gpu/drm/ttm/ttm_bo.c  | 6 ++
 drivers/gpu/drm/ttm/ttm_bo_manager.c  | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c   | 2 +-
 include/drm/ttm/ttm_bo_api.h  | 6 ++
 include/drm/ttm/ttm_bo_driver.h   | 2 --
 9 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index b664c5cb13ce..9fc3d876ed38 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -108,7 +108,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, 
uint64_t gtt_size)
man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED;
 
-   ttm_mem_type_manager_init(>mman.bdev, man, gtt_size >> 
PAGE_SHIFT);
+   ttm_mem_type_manager_init(man, gtt_size >> PAGE_SHIFT);
 
start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index bbc528c0ed3e..684698cdf772 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -190,7 +190,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
 
-   ttm_mem_type_manager_init(>mman.bdev, man, 
adev->gmc.real_vram_size >> PAGE_SHIFT);
+   ttm_mem_type_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);
 
man->func = _vram_mgr_func;
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c 
b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 58d9bd708e95..d408e1485cce 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -175,7 +175,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
man->func = _vram_manager;
man->use_io_reserve_lru = true;
 
-   ttm_mem_type_manager_init(>ttm.bdev, man,
+   ttm_mem_type_manager_init(man,
  drm->gem.vram_available >> 
PAGE_SHIFT);
ttm_set_driver_manager(>ttm.bdev, TTM_PL_VRAM, man);
ttm_mem_type_manager_set_used(man, true);
@@ -237,9 +237,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
man->available_caching = available_caching;
man->default_caching = default_caching;
man->use_tt = true;
-   ttm_mem_type_manager_init(>ttm.bdev, man,
- size_pages);
-
+   ttm_mem_type_manager_init(man, size_pages);
ttm_set_driver_manager(>ttm.bdev, TTM_PL_TT, man);
ttm_mem_type_manager_set_used(man, true);
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 3a3a4dfb0fff..78b72443a9ef 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1471,8 +1471,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned 
mem_type)
 }
 EXPORT_SYMBOL(ttm_bo_evict_mm);
 
-void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
-  struct ttm_mem_type_manager *man,
+void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
   unsigned long p_size)
 {
unsigned i;
@@ -1482,7 +1481,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
mutex_init(>io_reserve_mutex);
spin_lock_init(>move_lock);
INIT_LIST_HEAD(>io_reserve_lru);
-   man->bdev = bdev;
man->size = p_size;
 
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
@@ -1595,7 +1593,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED;
 
-   ttm_mem_type_manager_init(bdev, man, 0);
+   ttm_mem_type_manager_init(man, 0);
ttm_mem_type_manager_set_used(man, true);
 }
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c 
b/drivers/gpu/drm/ttm/ttm_bo_manager.c
index 01d41c6f2f7b..1b7245ce3356 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
@@ -133,7 +133,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 
man->func = _bo_manager_func;
 
-   ttm_mem_type_manager_init(bdev, man, p_size);
+   ttm_mem_type_manager_init(man, p_size);
 
drm_mm_init(>mm, 0, p_size);
spin_lock_init(>lock);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c