drm/amdgpu: link all gtt when binding them V2

V2:
spin lock instead of mutex for gtt list

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 17 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 86762cd74f6d..829b0b4eb838 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -2121,6 +2121,10 @@ struct amdgpu_device {
         /* link all shadow bo */
         struct list_head                shadow_list;
         struct mutex                    shadow_list_lock;
+        /* link all gtt */
+        spinlock_t                      gtt_list_lock;
+        struct list_head                gtt_list;
+
 };
 
 bool amdgpu_device_is_px(struct drm_device *dev);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index f95bcb80dde3..bfdd445a8bb6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1577,6 +1577,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,
         INIT_LIST_HEAD(&adev->shadow_list);
         mutex_init(&adev->shadow_list_lock);
 
+        INIT_LIST_HEAD(&adev->gtt_list);
+        spin_lock_init(&adev->gtt_list_lock);
+
         if (adev->asic_type >= CHIP_BONAIRE) {
                 adev->rmmio_base = pci_resource_start(adev->pdev, 5);
                 adev->rmmio_size = pci_resource_len(adev->pdev, 5);
@@ -1584,6 +1587,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
                 adev->rmmio_base = pci_resource_start(adev->pdev, 2);
                 adev->rmmio_size = pci_resource_len(adev->pdev, 2);
         }
+
         adev->rmmio = ioremap(adev->rmmio_base, adev->rmmio_size);
         if (adev->rmmio == NULL) {
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 5447973483ec..26ca3dd183eb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -520,6 +520,7 @@ struct amdgpu_ttm_tt {
         spinlock_t              guptasklock;
         struct list_head        guptasks;
         atomic_t                mmu_invalidations;
+        struct list_head        list;
 };
 
 int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)
@@ -666,6 +667,9 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
                           ttm->num_pages, (unsigned)gtt->offset);
                 return r;
         }
+        spin_lock(&gtt->adev->gtt_list_lock);
+        list_add_tail(&gtt->list, &gtt->adev->gtt_list);
+        spin_unlock(&gtt->adev->gtt_list_lock);
         return 0;
 }
 
@@ -680,6 +684,10 @@ static int amdgpu_ttm_backend_unbind(struct ttm_tt *ttm)
         if (gtt->userptr)
                 amdgpu_ttm_tt_unpin_userptr(ttm);
 
+        spin_lock(&gtt->adev->gtt_list_lock);
+        list_del_init(&gtt->list);
+        spin_unlock(&gtt->adev->gtt_list_lock);
+
         return 0;
 }
 
@@ -716,6 +724,7 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_bo_device *bdev,
                 kfree(gtt);
                 return NULL;
         }
+        INIT_LIST_HEAD(&gtt->list);
         return &gtt->ttm.ttm;
 }