drm/amdgpu: unify BO evicting method in amdgpu_ttm

From Nirmoy Das
90253ae21c6b55532abad261e3a7dfa809c3bae9 in linux 5.15.y/5.15.39
58144d283712c9e80e528e001af6ac5aeee71af2 in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_debugfs.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_debugfs.c
index ec30d81..348629e 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -1176,7 +1176,7 @@ static int amdgpu_debugfs_evict_vram(void *data, u64 *val)
                return r;
        }
 
-       *val = amdgpu_bo_evict_vram(adev);
+       *val = amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM);
 
        pm_runtime_mark_last_busy(dev->dev);
        pm_runtime_put_autosuspend(dev->dev);
@@ -1189,17 +1189,15 @@ static int amdgpu_debugfs_evict_gtt(void *data, u64 *val)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)data;
        struct drm_device *dev = adev_to_drm(adev);
-       struct ttm_resource_manager *man;
        int r;
 
        r = pm_runtime_get_sync(dev->dev);
        if (r < 0) {
-               pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
+               pm_runtime_put_autosuspend(dev->dev);
                return r;
        }
 
-       man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);
-       *val = ttm_resource_manager_evict_all(&adev->mman.bdev, man);
+       *val = amdgpu_ttm_evict_resources(adev, TTM_PL_TT);
 
        pm_runtime_mark_last_busy(dev->dev);
        pm_runtime_put_autosuspend(dev->dev);

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
index 48a805c..1d85450 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c
@@ -4016,6 +4016,25 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
 
 }
 
+/**
+ * amdgpu_device_evict_resources - evict device resources
+ * @adev: amdgpu device object
+ *
+ * Evicts all ttm device resources(vram BOs, gart table) from the lru list
+ * of the vram memory type. Mainly used for evicting device resources
+ * at suspend time.
+ *
+ */
+static void amdgpu_device_evict_resources(struct amdgpu_device *adev)
+{
+       /* No need to evict vram on APUs for suspend to ram */
+       if (adev->in_s3 && (adev->flags & AMD_IS_APU))
+               return;
+
+       if (amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM))
+               DRM_WARN("evicting device resources failed\n");
+
+}
 
 /*
  * Suspend & resume.
@@ -4061,17 +4080,16 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
        if (!adev->in_s0ix)
                amdgpu_amdkfd_suspend(adev, adev->in_runpm);
 
-       /* evict vram memory */
-       amdgpu_bo_evict_vram(adev);
+       /* First evict vram memory */
+       amdgpu_device_evict_resources(adev);
 
        amdgpu_fence_driver_hw_fini(adev);
 
        amdgpu_device_ip_suspend_phase2(adev);
-       /* evict remaining vram memory
-        * This second call to evict vram is to evict the gart page table
-        * using the CPU.
+       /* This second call to evict device resources is to evict
+        * the gart page table using the CPU.
         */
-       amdgpu_bo_evict_vram(adev);
+       amdgpu_device_evict_resources(adev);
 
        return 0;
 }

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c
index 4959b60..b5c67fb 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c
@@ -1044,29 +1044,6 @@ void amdgpu_bo_unpin(struct amdgpu_bo *bo)
        }
 }
 
-/**
- * amdgpu_bo_evict_vram - evict VRAM buffers
- * @adev: amdgpu device object
- *
- * Evicts all VRAM buffers on the lru list of the memory type.
- * Mainly used for evicting vram at suspend time.
- *
- * Returns:
- * 0 for success or a negative error code on failure.
- */
-int amdgpu_bo_evict_vram(struct amdgpu_device *adev)
-{
-       struct ttm_resource_manager *man;
-
-       if (adev->in_s3 && (adev->flags & AMD_IS_APU)) {
-               /* No need to evict vram on APUs for suspend to ram */
-               return 0;
-       }
-
-       man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
-       return ttm_resource_manager_evict_all(&adev->mman.bdev, man);
-}
-
 static const char *amdgpu_vram_names[] = {
        "UNKNOWN",
        "GDDR1",

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h
index 92d6f7d..e73c83c 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.h
@@ -305,7 +305,6 @@ int amdgpu_bo_pin(struct amdgpu_bo *bo, u32 domain);
 int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
                             u64 min_offset, u64 max_offset);
 void amdgpu_bo_unpin(struct amdgpu_bo *bo);
-int amdgpu_bo_evict_vram(struct amdgpu_device *adev);
 int amdgpu_bo_init(struct amdgpu_device *adev);
 void amdgpu_bo_fini(struct amdgpu_device *adev);
 int amdgpu_bo_set_tiling_flags(struct amdgpu_bo *bo, u64 tiling_flags);

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.c
index dad8610..9b75fe9 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2093,6 +2093,36 @@ error_free:
        return r;
 }
 
+/**
+ * amdgpu_ttm_evict_resources - evict memory buffers
+ * @adev: amdgpu device object
+ * @mem_type: evicted BO's memory type
+ *
+ * Evicts all @mem_type buffers on the lru list of the memory type.
+ *
+ * Returns:
+ * 0 for success or a negative error code on failure.
+ */
+int amdgpu_ttm_evict_resources(struct amdgpu_device *adev, int mem_type)
+{
+       struct ttm_resource_manager *man;
+
+       switch (mem_type) {
+       case TTM_PL_VRAM:
+       case TTM_PL_TT:
+       case AMDGPU_PL_GWS:
+       case AMDGPU_PL_GDS:
+       case AMDGPU_PL_OA:
+               man = ttm_manager_type(&adev->mman.bdev, mem_type);
+               break;
+       default:
+               DRM_ERROR("Trying to evict invalid memory type\n");
+               return -EINVAL;
+       }
+
+       return ttm_resource_manager_evict_all(&adev->mman.bdev, man);
+}
+
 #if defined(CONFIG_DEBUG_FS)
 
 static int amdgpu_mm_vram_table_show(struct seq_file *m, void *unused)

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.h
index 10de405..bfd8472 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_ttm.h
@@ -191,6 +191,7 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);
 uint64_t amdgpu_ttm_tt_pde_flags(struct ttm_tt *ttm, struct ttm_resource *mem);
 uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
                                 struct ttm_resource *mem);
+int amdgpu_ttm_evict_resources(struct amdgpu_device *adev, int mem_type);
 
 void amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);