Re: [PATCH 58/59] drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager.

2020-08-04 Thread Ben Skeggs 
On Tue, 4 Aug 2020 at 21:41, Christian König  wrote:
>
> Am 04.08.20 um 04:56 schrieb Dave Airlie:
> > From: Dave Airlie 
> >
> > This name makes a lot more sense, since these are about managing
> > driver resources rather than just memory ranges.
> >
> > Signed-off-by: Dave Airlie 
>
> Acked-by: Christian König 
Reviewed-by: Ben Skeggs 

>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c|  2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c|  2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 36 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |  4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c|  2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |  4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  8 +--
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 36 +-
> >   drivers/gpu/drm/drm_gem_vram_helper.c |  4 +-
> >   drivers/gpu/drm/nouveau/nouveau_ttm.c | 46 ++---
> >   drivers/gpu/drm/nouveau/nouveau_ttm.h |  6 +-
> >   drivers/gpu/drm/qxl/qxl_ttm.c |  4 +-
> >   drivers/gpu/drm/radeon/radeon_gem.c   |  2 +-
> >   drivers/gpu/drm/radeon/radeon_ttm.c   |  4 +-
> >   drivers/gpu/drm/ttm/ttm_bo.c  | 66 +--
> >   drivers/gpu/drm/ttm/ttm_bo_util.c | 26 
> >   drivers/gpu/drm/ttm/ttm_bo_vm.c   |  2 +-
> >   drivers/gpu/drm/ttm/ttm_range_manager.c   | 28 
> >   drivers/gpu/drm/vmwgfx/vmwgfx_drv.c   | 20 +++---
> >   drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 26 
> >   drivers/gpu/drm/vmwgfx/vmwgfx_thp.c   | 26 
> >   include/drm/ttm/ttm_bo_api.h  |  6 +-
> >   include/drm/ttm/ttm_bo_driver.h   | 60 -
> >   23 files changed, 210 insertions(+), 210 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> > index e24f421e5553..478f67498a17 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> > @@ -517,7 +517,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, 
> > int dma_buf_fd,
> >   uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
> >   {
> >   struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> > - struct ttm_mem_type_manager *vram_man = 
> > ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
> > + struct ttm_resource_manager *vram_man = 
> > ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
> >
> >   return amdgpu_vram_mgr_usage(vram_man);
> >   }
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > index 9829640e1769..ecd051976bce 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > @@ -299,7 +299,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct 
> > amdgpu_device *adev,
> >   {
> >   s64 time_us, increment_us;
> >   u64 free_vram, total_vram, used_vram;
> > - struct ttm_mem_type_manager *vram_man = 
> > ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
> > + struct ttm_resource_manager *vram_man = 
> > ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
> >   /* Allow a maximum of 200 accumulated ms. This is basically per-IB
> >* throttling.
> >*
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> > index 71461d652fcc..8b600b804f34 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> > @@ -25,13 +25,13 @@
> >   #include "amdgpu.h"
> >
> >   struct amdgpu_gtt_mgr {
> > - struct ttm_mem_type_manager manager;
> > + struct ttm_resource_manager manager;
> >   struct drm_mm mm;
> >   spinlock_t lock;
> >   atomic64_t available;
> >   };
> >
> > -static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct 
> > ttm_mem_type_manager *man)
> > +static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct 
> > ttm_resource_manager *man)
> >   {
> >   return container_of(man, struct amdgpu_gtt_mgr, manager);
> >   }
> > @@ -54,7 +54,7 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct 
> > device *dev,
> >   {
> >   struct drm_device *ddev = dev_get_drvdata(dev);
> >   struct amdgpu_device *adev = ddev->dev_private;
> > - struct ttm_mem_type_manager *man = ttm_manager_type(>mman.bdev, 
> > TTM_PL_TT);
> > + struct ttm_resource_manager *man = ttm_manager_type(>mman.bdev, 
> > TTM_PL_TT);
> >   return snprintf(buf, PAGE_SIZE, "%llu\n",
> >   man->size * PAGE_SIZE);
> >   }
> > @@ -72,7 +72,7 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct 
> > device *dev,
> >   {
> >   struct drm_device *ddev = dev_get_drvdata(dev);
> >   struct amdgpu_device *adev = ddev->dev_private;
> > - struct ttm_mem_type_manager *man =

Re: [PATCH 58/59] drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager.

2020-08-04 Thread Christian König 

Am 04.08.20 um 04:56 schrieb Dave Airlie:

From: Dave Airlie 

This name makes a lot more sense, since these are about managing
driver resources rather than just memory ranges.

Signed-off-by: Dave Airlie 


Acked-by: Christian König 


---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c|  2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c|  2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 36 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |  4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c|  2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |  4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  8 +--
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 36 +-
  drivers/gpu/drm/drm_gem_vram_helper.c |  4 +-
  drivers/gpu/drm/nouveau/nouveau_ttm.c | 46 ++---
  drivers/gpu/drm/nouveau/nouveau_ttm.h |  6 +-
  drivers/gpu/drm/qxl/qxl_ttm.c |  4 +-
  drivers/gpu/drm/radeon/radeon_gem.c   |  2 +-
  drivers/gpu/drm/radeon/radeon_ttm.c   |  4 +-
  drivers/gpu/drm/ttm/ttm_bo.c  | 66 +--
  drivers/gpu/drm/ttm/ttm_bo_util.c | 26 
  drivers/gpu/drm/ttm/ttm_bo_vm.c   |  2 +-
  drivers/gpu/drm/ttm/ttm_range_manager.c   | 28 
  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c   | 20 +++---
  drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 26 
  drivers/gpu/drm/vmwgfx/vmwgfx_thp.c   | 26 
  include/drm/ttm/ttm_bo_api.h  |  6 +-
  include/drm/ttm/ttm_bo_driver.h   | 60 -
  23 files changed, 210 insertions(+), 210 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index e24f421e5553..478f67498a17 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -517,7 +517,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int 
dma_buf_fd,
  uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
  {
struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
-   struct ttm_mem_type_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
+   struct ttm_resource_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
  
  	return amdgpu_vram_mgr_usage(vram_man);

  }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9829640e1769..ecd051976bce 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -299,7 +299,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct 
amdgpu_device *adev,
  {
s64 time_us, increment_us;
u64 free_vram, total_vram, used_vram;
-   struct ttm_mem_type_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
+   struct ttm_resource_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
/* Allow a maximum of 200 accumulated ms. This is basically per-IB
 * throttling.
 *
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 71461d652fcc..8b600b804f34 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -25,13 +25,13 @@
  #include "amdgpu.h"
  
  struct amdgpu_gtt_mgr {

-   struct ttm_mem_type_manager manager;
+   struct ttm_resource_manager manager;
struct drm_mm mm;
spinlock_t lock;
atomic64_t available;
  };
  
-static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_mem_type_manager *man)

+static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_resource_manager 
*man)
  {
return container_of(man, struct amdgpu_gtt_mgr, manager);
  }
@@ -54,7 +54,7 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct device 
*dev,
  {
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = ddev->dev_private;
-   struct ttm_mem_type_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
+   struct ttm_resource_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
return snprintf(buf, PAGE_SIZE, "%llu\n",
man->size * PAGE_SIZE);
  }
@@ -72,7 +72,7 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device 
*dev,
  {
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = ddev->dev_private;
-   struct ttm_mem_type_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
+   struct ttm_resource_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
return snprintf(buf, PAGE_SIZE, "%llu\n",
amdgpu_gtt_mgr_usage(man));
  }
@@ -82,7 +82,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
  static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
   amdgpu_mem_info_gtt_used_show, NULL);
  
-static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;

[PATCH 58/59] drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager.

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

This name makes a lot more sense, since these are about managing
driver resources rather than just memory ranges.

Signed-off-by: Dave Airlie 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c|  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c|  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c   | 36 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |  4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c|  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |  4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  8 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 36 +-
 drivers/gpu/drm/drm_gem_vram_helper.c |  4 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 46 ++---
 drivers/gpu/drm/nouveau/nouveau_ttm.h |  6 +-
 drivers/gpu/drm/qxl/qxl_ttm.c |  4 +-
 drivers/gpu/drm/radeon/radeon_gem.c   |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c   |  4 +-
 drivers/gpu/drm/ttm/ttm_bo.c  | 66 +--
 drivers/gpu/drm/ttm/ttm_bo_util.c | 26 
 drivers/gpu/drm/ttm/ttm_bo_vm.c   |  2 +-
 drivers/gpu/drm/ttm/ttm_range_manager.c   | 28 
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c   | 20 +++---
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 26 
 drivers/gpu/drm/vmwgfx/vmwgfx_thp.c   | 26 
 include/drm/ttm/ttm_bo_api.h  |  6 +-
 include/drm/ttm/ttm_bo_driver.h   | 60 -
 23 files changed, 210 insertions(+), 210 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index e24f421e5553..478f67498a17 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -517,7 +517,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int 
dma_buf_fd,
 uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)
 {
struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
-   struct ttm_mem_type_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
+   struct ttm_resource_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
 
return amdgpu_vram_mgr_usage(vram_man);
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9829640e1769..ecd051976bce 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -299,7 +299,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct 
amdgpu_device *adev,
 {
s64 time_us, increment_us;
u64 free_vram, total_vram, used_vram;
-   struct ttm_mem_type_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
+   struct ttm_resource_manager *vram_man = 
ttm_manager_type(>mman.bdev, TTM_PL_VRAM);
/* Allow a maximum of 200 accumulated ms. This is basically per-IB
 * throttling.
 *
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 71461d652fcc..8b600b804f34 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -25,13 +25,13 @@
 #include "amdgpu.h"
 
 struct amdgpu_gtt_mgr {
-   struct ttm_mem_type_manager manager;
+   struct ttm_resource_manager manager;
struct drm_mm mm;
spinlock_t lock;
atomic64_t available;
 };
 
-static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_mem_type_manager 
*man)
+static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_resource_manager 
*man)
 {
return container_of(man, struct amdgpu_gtt_mgr, manager);
 }
@@ -54,7 +54,7 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct device 
*dev,
 {
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = ddev->dev_private;
-   struct ttm_mem_type_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
+   struct ttm_resource_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
return snprintf(buf, PAGE_SIZE, "%llu\n",
man->size * PAGE_SIZE);
 }
@@ -72,7 +72,7 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device 
*dev,
 {
struct drm_device *ddev = dev_get_drvdata(dev);
struct amdgpu_device *adev = ddev->dev_private;
-   struct ttm_mem_type_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
+   struct ttm_resource_manager *man = ttm_manager_type(>mman.bdev, 
TTM_PL_TT);
return snprintf(buf, PAGE_SIZE, "%llu\n",
amdgpu_gtt_mgr_usage(man));
 }
@@ -82,7 +82,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
 static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
   amdgpu_mem_info_gtt_used_show, NULL);
 
-static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
+static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func;
 /**
  * amdgpu_gtt_mgr_init - init GTT