Merge tag 'drm-misc-next-2022-09-09' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ttm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 2e97099808ca3434dc26c4186da6e56a204a27fc..b1c455329023ad7fcb9ed18692b039e412e188de 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1330,11 +1330,12 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
 static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
                                            const struct ttm_place *place)
 {
-       unsigned long num_pages = bo->resource->num_pages;
        struct dma_resv_iter resv_cursor;
-       struct amdgpu_res_cursor cursor;
        struct dma_fence *f;
 
+       if (!amdgpu_bo_is_amdgpu_bo(bo))
+               return ttm_bo_eviction_valuable(bo, place);
+
        /* Swapout? */
        if (bo->resource->mem_type == TTM_PL_SYSTEM)
                return true;
@@ -1353,40 +1354,20 @@ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
                        return false;
        }
 
-       switch (bo->resource->mem_type) {
-       case AMDGPU_PL_PREEMPT:
-               /* Preemptible BOs don't own system resources managed by the
-                * driver (pages, VRAM, GART space). They point to resources
-                * owned by someone else (e.g. pageable memory in user mode
-                * or a DMABuf). They are used in a preemptible context so we
-                * can guarantee no deadlocks and good QoS in case of MMU
-                * notifiers or DMABuf move notifiers from the resource owner.
-                */
+       /* Preemptible BOs don't own system resources managed by the
+        * driver (pages, VRAM, GART space). They point to resources
+        * owned by someone else (e.g. pageable memory in user mode
+        * or a DMABuf). They are used in a preemptible context so we
+        * can guarantee no deadlocks and good QoS in case of MMU
+        * notifiers or DMABuf move notifiers from the resource owner.
+        */
+       if (bo->resource->mem_type == AMDGPU_PL_PREEMPT)
                return false;
-       case TTM_PL_TT:
-               if (amdgpu_bo_is_amdgpu_bo(bo) &&
-                   amdgpu_bo_encrypted(ttm_to_amdgpu_bo(bo)))
-                       return false;
-               return true;
 
-       case TTM_PL_VRAM:
-               /* Check each drm MM node individually */
-               amdgpu_res_first(bo->resource, 0, (u64)num_pages << PAGE_SHIFT,
-                                &cursor);
-               while (cursor.remaining) {
-                       if (place->fpfn < PFN_DOWN(cursor.start + cursor.size)
-                           && !(place->lpfn &&
-                                place->lpfn <= PFN_DOWN(cursor.start)))
-                               return true;
-
-                       amdgpu_res_next(&cursor, cursor.size);
-               }
+       if (bo->resource->mem_type == TTM_PL_TT &&
+           amdgpu_bo_encrypted(ttm_to_amdgpu_bo(bo)))
                return false;
 
-       default:
-               break;
-       }
-
        return ttm_bo_eviction_valuable(bo, place);
 }