Re: [PATCH 02/13] drm/amdgpu: rename vram_mgr functions to bar_mgr

2023-02-06 Thread Alex Deucher 
On Mon, Feb 6, 2023 at 6:21 AM Christian König  wrote:
>
> Am 03.02.23 um 20:08 schrieb Shashank Sharma:
> > From: Alex Deucher 
> >
> > Rename the VRAM manager functions so they can be resused to manage
> > doorbell BAR as well.
>
> Yeah, as said before Alex did this before we had the buddy allocator.
>
> This doesn't makes sense any more and should probably be dropped completely.

I had suggested that we just use this as is for now so we could get
everything up and running to prove this out.  Now that we have this
actually working, we can look at dropping this.

Alex


>
> Christian.
>
> >
> > Cc: Christian Koenig 
> > Signed-off-by: Alex Deucher 
> > Signed-off-by: Shashank Sharma 
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c|   2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c   |   8 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c   |   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c|   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c   |   4 +-
> >   .../gpu/drm/amd/amdgpu/amdgpu_res_cursor.h|  14 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |   4 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  36 ++--
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c  |   2 +-
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 200 ++
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h  |  18 +-
> >   12 files changed, 157 insertions(+), 143 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > index 7b5ce00f0602..e34eae8d64cf 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > @@ -723,7 +723,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct 
> > amdgpu_device *adev,
> >   if (!amdgpu_gmc_vram_full_visible(>gmc)) {
> >   u64 total_vis_vram = adev->gmc.visible_vram_size;
> >   u64 used_vis_vram =
> > -   amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
> > +   amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
> >
> >   if (used_vis_vram < total_vis_vram) {
> >   u64 free_vis_vram = total_vis_vram - used_vis_vram;
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> > index 271e30e34d93..c48ccde281c3 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
> > @@ -179,9 +179,9 @@ static struct sg_table *amdgpu_dma_buf_map(struct 
> > dma_buf_attachment *attach,
> >   break;
> >
> >   case TTM_PL_VRAM:
> > - r = amdgpu_vram_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
> > -   bo->tbo.base.size, attach->dev,
> > -   dir, );
> > + r = amdgpu_bar_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
> > +  bo->tbo.base.size, attach->dev,
> > +  dir, );
> >   if (r)
> >   return ERR_PTR(r);
> >   break;
> > @@ -215,7 +215,7 @@ static void amdgpu_dma_buf_unmap(struct 
> > dma_buf_attachment *attach,
> >   sg_free_table(sgt);
> >   kfree(sgt);
> >   } else {
> > - amdgpu_vram_mgr_free_sgt(attach->dev, dir, sgt);
> > + amdgpu_bar_mgr_free_sgt(attach->dev, dir, sgt);
> >   }
> >   }
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > index cd4caaa29528..9f148ea7ca66 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > @@ -2807,12 +2807,12 @@ static struct pci_error_handlers 
> > amdgpu_pci_err_handler = {
> >   .resume = amdgpu_pci_resume,
> >   };
> >
> > -extern const struct attribute_group amdgpu_vram_mgr_attr_group;
> > +extern const struct attribute_group amdgpu_bar_mgr_attr_group;
> >   extern const struct attribute_group amdgpu_gtt_mgr_attr_group;
> >   extern const struct attribute_group amdgpu_vbios_version_attr_group;
> >
> >   static const struct attribute_group *amdgpu_sysfs_groups[] = {
> > - _vram_mgr_attr_group,
> > + _bar_mgr_attr_group,
> >   _gtt_mgr_attr_group,
> >   _vbios_version_attr_group,
> >   NULL,
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > index 7aa7e52ca784..2ce11434fb22 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > @@ -650,7 +650,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void 
> > *data, struct drm_file *filp)
> >   ui64 = 
> > ttm_resource_manager_usage(>mman.vram_mgr.manager);
> >   return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
> >

Re: [PATCH 02/13] drm/amdgpu: rename vram_mgr functions to bar_mgr

2023-02-06 Thread Christian König 

Am 06.02.23 um 16:34 schrieb Shashank Sharma:


On 06/02/2023 12:20, Christian König wrote:

Am 03.02.23 um 20:08 schrieb Shashank Sharma:

From: Alex Deucher 

Rename the VRAM manager functions so they can be resused to manage
doorbell BAR as well.


Yeah, as said before Alex did this before we had the buddy allocator.

This doesn't makes sense any more and should probably be dropped 
completely.


Christian.



Yeah, I was wondering if we just not use the buddy-allocation for 
doorbell, but still separate out the VRAM vs DB function, would that 
make better sense ?


Nope. One of the main reasons we have a separate buddy based manager for 
VRAM is that we have CPU visible vs invisible areas.


For the doorbell we simply don't have any of that, so the additional 
complexity is just superfluous and will sooner or later cause trouble.


Christian.



- Shashank






Cc: Christian Koenig 
Signed-off-by: Alex Deucher 
Signed-off-by: Shashank Sharma 
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c    |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c   |   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c    |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c   |   4 +-
  .../gpu/drm/amd/amdgpu/amdgpu_res_cursor.h    |  14 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  36 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c  |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 200 
++

  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h  |  18 +-
  12 files changed, 157 insertions(+), 143 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

index 7b5ce00f0602..e34eae8d64cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -723,7 +723,7 @@ static void 
amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,

  if (!amdgpu_gmc_vram_full_visible(>gmc)) {
  u64 total_vis_vram = adev->gmc.visible_vram_size;
  u64 used_vis_vram =
- amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+ amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
    if (used_vis_vram < total_vis_vram) {
  u64 free_vis_vram = total_vis_vram - used_vis_vram;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

index 271e30e34d93..c48ccde281c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -179,9 +179,9 @@ static struct sg_table 
*amdgpu_dma_buf_map(struct dma_buf_attachment *attach,

  break;
    case TTM_PL_VRAM:
-    r = amdgpu_vram_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
-  bo->tbo.base.size, attach->dev,
-  dir, );
+    r = amdgpu_bar_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
+ bo->tbo.base.size, attach->dev,
+ dir, );
  if (r)
  return ERR_PTR(r);
  break;
@@ -215,7 +215,7 @@ static void amdgpu_dma_buf_unmap(struct 
dma_buf_attachment *attach,

  sg_free_table(sgt);
  kfree(sgt);
  } else {
-    amdgpu_vram_mgr_free_sgt(attach->dev, dir, sgt);
+    amdgpu_bar_mgr_free_sgt(attach->dev, dir, sgt);
  }
  }
  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

index cd4caaa29528..9f148ea7ca66 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2807,12 +2807,12 @@ static struct pci_error_handlers 
amdgpu_pci_err_handler = {

  .resume    = amdgpu_pci_resume,
  };
  -extern const struct attribute_group amdgpu_vram_mgr_attr_group;
+extern const struct attribute_group amdgpu_bar_mgr_attr_group;
  extern const struct attribute_group amdgpu_gtt_mgr_attr_group;
  extern const struct attribute_group amdgpu_vbios_version_attr_group;
    static const struct attribute_group *amdgpu_sysfs_groups[] = {
-    _vram_mgr_attr_group,
+    _bar_mgr_attr_group,
  _gtt_mgr_attr_group,
  _vbios_version_attr_group,
  NULL,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

index 7aa7e52ca784..2ce11434fb22 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -650,7 +650,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, 
void *data, struct drm_file *filp)
  ui64 = 
ttm_resource_manager_usage(>mman.vram_mgr.manager);

  return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
  case AMDGPU_INFO_VIS_VRAM_USAGE:
-    ui64 = amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+    ui64 = amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
  return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
  case AMDGPU_INFO_GTT_USAGE:
 

Re: [PATCH 02/13] drm/amdgpu: rename vram_mgr functions to bar_mgr

2023-02-06 Thread Shashank Sharma 



On 06/02/2023 12:20, Christian König wrote:

Am 03.02.23 um 20:08 schrieb Shashank Sharma:

From: Alex Deucher 

Rename the VRAM manager functions so they can be resused to manage
doorbell BAR as well.


Yeah, as said before Alex did this before we had the buddy allocator.

This doesn't makes sense any more and should probably be dropped 
completely.


Christian.



Yeah, I was wondering if we just not use the buddy-allocation for 
doorbell, but still separate out the VRAM vs DB function, would that 
make better sense ?


- Shashank






Cc: Christian Koenig 
Signed-off-by: Alex Deucher 
Signed-off-by: Shashank Sharma 
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c    |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c   |   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c    |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c   |   4 +-
  .../gpu/drm/amd/amdgpu/amdgpu_res_cursor.h    |  14 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  36 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c  |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 200 ++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h  |  18 +-
  12 files changed, 157 insertions(+), 143 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

index 7b5ce00f0602..e34eae8d64cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -723,7 +723,7 @@ static void 
amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev,

  if (!amdgpu_gmc_vram_full_visible(>gmc)) {
  u64 total_vis_vram = adev->gmc.visible_vram_size;
  u64 used_vis_vram =
- amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+ amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
    if (used_vis_vram < total_vis_vram) {
  u64 free_vis_vram = total_vis_vram - used_vis_vram;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

index 271e30e34d93..c48ccde281c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -179,9 +179,9 @@ static struct sg_table *amdgpu_dma_buf_map(struct 
dma_buf_attachment *attach,

  break;
    case TTM_PL_VRAM:
-    r = amdgpu_vram_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
-  bo->tbo.base.size, attach->dev,
-  dir, );
+    r = amdgpu_bar_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
+ bo->tbo.base.size, attach->dev,
+ dir, );
  if (r)
  return ERR_PTR(r);
  break;
@@ -215,7 +215,7 @@ static void amdgpu_dma_buf_unmap(struct 
dma_buf_attachment *attach,

  sg_free_table(sgt);
  kfree(sgt);
  } else {
-    amdgpu_vram_mgr_free_sgt(attach->dev, dir, sgt);
+    amdgpu_bar_mgr_free_sgt(attach->dev, dir, sgt);
  }
  }
  diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

index cd4caaa29528..9f148ea7ca66 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2807,12 +2807,12 @@ static struct pci_error_handlers 
amdgpu_pci_err_handler = {

  .resume    = amdgpu_pci_resume,
  };
  -extern const struct attribute_group amdgpu_vram_mgr_attr_group;
+extern const struct attribute_group amdgpu_bar_mgr_attr_group;
  extern const struct attribute_group amdgpu_gtt_mgr_attr_group;
  extern const struct attribute_group amdgpu_vbios_version_attr_group;
    static const struct attribute_group *amdgpu_sysfs_groups[] = {
-    _vram_mgr_attr_group,
+    _bar_mgr_attr_group,
  _gtt_mgr_attr_group,
  _vbios_version_attr_group,
  NULL,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

index 7aa7e52ca784..2ce11434fb22 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -650,7 +650,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, 
void *data, struct drm_file *filp)
  ui64 = 
ttm_resource_manager_usage(>mman.vram_mgr.manager);

  return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
  case AMDGPU_INFO_VIS_VRAM_USAGE:
-    ui64 = amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+    ui64 = amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
  return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
  case AMDGPU_INFO_GTT_USAGE:
  ui64 = 
ttm_resource_manager_usage(>mman.gtt_mgr.manager);
@@ -704,7 +704,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, 
void *data, struct drm_file *filp)

  atomic64_read(>visible_pin_size),
  mem.vram.usable_heap_size);
  mem.cpu_accessible_vram.heap_usage =
-

Re: [PATCH 02/13] drm/amdgpu: rename vram_mgr functions to bar_mgr

2023-02-06 Thread Christian König 

Am 03.02.23 um 20:08 schrieb Shashank Sharma:

From: Alex Deucher 

Rename the VRAM manager functions so they can be resused to manage
doorbell BAR as well.


Yeah, as said before Alex did this before we had the buddy allocator.

This doesn't makes sense any more and should probably be dropped completely.

Christian.



Cc: Christian Koenig 
Signed-off-by: Alex Deucher 
Signed-off-by: Shashank Sharma 
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c|   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c   |   8 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_object.c|   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c   |   4 +-
  .../gpu/drm/amd/amdgpu/amdgpu_res_cursor.h|  14 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |   4 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  36 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c  |   2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 200 ++
  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h  |  18 +-
  12 files changed, 157 insertions(+), 143 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 7b5ce00f0602..e34eae8d64cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -723,7 +723,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct 
amdgpu_device *adev,
if (!amdgpu_gmc_vram_full_visible(>gmc)) {
u64 total_vis_vram = adev->gmc.visible_vram_size;
u64 used_vis_vram =
- amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+ amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
  
  		if (used_vis_vram < total_vis_vram) {

u64 free_vis_vram = total_vis_vram - used_vis_vram;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index 271e30e34d93..c48ccde281c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -179,9 +179,9 @@ static struct sg_table *amdgpu_dma_buf_map(struct 
dma_buf_attachment *attach,
break;
  
  	case TTM_PL_VRAM:

-   r = amdgpu_vram_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
- bo->tbo.base.size, attach->dev,
- dir, );
+   r = amdgpu_bar_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
+bo->tbo.base.size, attach->dev,
+dir, );
if (r)
return ERR_PTR(r);
break;
@@ -215,7 +215,7 @@ static void amdgpu_dma_buf_unmap(struct dma_buf_attachment 
*attach,
sg_free_table(sgt);
kfree(sgt);
} else {
-   amdgpu_vram_mgr_free_sgt(attach->dev, dir, sgt);
+   amdgpu_bar_mgr_free_sgt(attach->dev, dir, sgt);
}
  }
  
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

index cd4caaa29528..9f148ea7ca66 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2807,12 +2807,12 @@ static struct pci_error_handlers amdgpu_pci_err_handler 
= {
.resume = amdgpu_pci_resume,
  };
  
-extern const struct attribute_group amdgpu_vram_mgr_attr_group;

+extern const struct attribute_group amdgpu_bar_mgr_attr_group;
  extern const struct attribute_group amdgpu_gtt_mgr_attr_group;
  extern const struct attribute_group amdgpu_vbios_version_attr_group;
  
  static const struct attribute_group *amdgpu_sysfs_groups[] = {

-   _vram_mgr_attr_group,
+   _bar_mgr_attr_group,
_gtt_mgr_attr_group,
_vbios_version_attr_group,
NULL,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 7aa7e52ca784..2ce11434fb22 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -650,7 +650,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, 
struct drm_file *filp)
ui64 = ttm_resource_manager_usage(>mman.vram_mgr.manager);
return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
case AMDGPU_INFO_VIS_VRAM_USAGE:
-   ui64 = amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+   ui64 = amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
case AMDGPU_INFO_GTT_USAGE:
ui64 = ttm_resource_manager_usage(>mman.gtt_mgr.manager);
@@ -704,7 +704,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, 
struct drm_file *filp)
atomic64_read(>visible_pin_size),
mem.vram.usable_heap_size);

[PATCH 02/13] drm/amdgpu: rename vram_mgr functions to bar_mgr

2023-02-03 Thread Shashank Sharma 
From: Alex Deucher 

Rename the VRAM manager functions so they can be resused to manage
doorbell BAR as well.

Cc: Christian Koenig 
Signed-off-by: Alex Deucher 
Signed-off-by: Shashank Sharma 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c|   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c   |   8 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c   |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c|   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c   |   4 +-
 .../gpu/drm/amd/amdgpu/amdgpu_res_cursor.h|  14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c   |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h   |  36 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c  |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c  | 200 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h  |  18 +-
 12 files changed, 157 insertions(+), 143 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 7b5ce00f0602..e34eae8d64cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -723,7 +723,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct 
amdgpu_device *adev,
if (!amdgpu_gmc_vram_full_visible(>gmc)) {
u64 total_vis_vram = adev->gmc.visible_vram_size;
u64 used_vis_vram =
- amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+ amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
 
if (used_vis_vram < total_vis_vram) {
u64 free_vis_vram = total_vis_vram - used_vis_vram;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
index 271e30e34d93..c48ccde281c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
@@ -179,9 +179,9 @@ static struct sg_table *amdgpu_dma_buf_map(struct 
dma_buf_attachment *attach,
break;
 
case TTM_PL_VRAM:
-   r = amdgpu_vram_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
- bo->tbo.base.size, attach->dev,
- dir, );
+   r = amdgpu_bar_mgr_alloc_sgt(adev, bo->tbo.resource, 0,
+bo->tbo.base.size, attach->dev,
+dir, );
if (r)
return ERR_PTR(r);
break;
@@ -215,7 +215,7 @@ static void amdgpu_dma_buf_unmap(struct dma_buf_attachment 
*attach,
sg_free_table(sgt);
kfree(sgt);
} else {
-   amdgpu_vram_mgr_free_sgt(attach->dev, dir, sgt);
+   amdgpu_bar_mgr_free_sgt(attach->dev, dir, sgt);
}
 }
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index cd4caaa29528..9f148ea7ca66 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2807,12 +2807,12 @@ static struct pci_error_handlers amdgpu_pci_err_handler 
= {
.resume = amdgpu_pci_resume,
 };
 
-extern const struct attribute_group amdgpu_vram_mgr_attr_group;
+extern const struct attribute_group amdgpu_bar_mgr_attr_group;
 extern const struct attribute_group amdgpu_gtt_mgr_attr_group;
 extern const struct attribute_group amdgpu_vbios_version_attr_group;
 
 static const struct attribute_group *amdgpu_sysfs_groups[] = {
-   _vram_mgr_attr_group,
+   _bar_mgr_attr_group,
_gtt_mgr_attr_group,
_vbios_version_attr_group,
NULL,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 7aa7e52ca784..2ce11434fb22 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -650,7 +650,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, 
struct drm_file *filp)
ui64 = ttm_resource_manager_usage(>mman.vram_mgr.manager);
return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
case AMDGPU_INFO_VIS_VRAM_USAGE:
-   ui64 = amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+   ui64 = amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
return copy_to_user(out, , min(size, 8u)) ? -EFAULT : 0;
case AMDGPU_INFO_GTT_USAGE:
ui64 = ttm_resource_manager_usage(>mman.gtt_mgr.manager);
@@ -704,7 +704,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, 
struct drm_file *filp)
atomic64_read(>visible_pin_size),
mem.vram.usable_heap_size);
mem.cpu_accessible_vram.heap_usage =
-   amdgpu_vram_mgr_vis_usage(>mman.vram_mgr);
+   amdgpu_bar_mgr_vis_usage(>mman.vram_mgr);
mem.cpu_accessible_vram.max_allocation =