drm/amdgpu: rework amdgpu_cs_find_mapping

Use the VM instead of the BO list to find the BO for a virtual address.

This fixes UVD/VCE in physical mode with VM local BOs.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 10 insertions, 32 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index c30110a3024a..5f19227b35e9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1479,46 +1479,24 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
                            uint64_t addr, struct amdgpu_bo **bo,
                            struct amdgpu_bo_va_mapping **map)
 {
+        struct amdgpu_fpriv *fpriv = parser->filp->driver_priv;
+        struct amdgpu_vm *vm = &fpriv->vm;
         struct amdgpu_bo_va_mapping *mapping;
-        unsigned i;
         int r;
 
-        if (!parser->bo_list)
-                return 0;
-
         addr /= AMDGPU_GPU_PAGE_SIZE;
 
-        for (i = 0; i < parser->bo_list->num_entries; i++) {
-                struct amdgpu_bo_list_entry *lobj;
-
-                lobj = &parser->bo_list->array[i];
-                if (!lobj->bo_va)
-                        continue;
-
-                list_for_each_entry(mapping, &lobj->bo_va->valids, list) {
-                        if (mapping->start > addr ||
-                            addr > mapping->last)
-                                continue;
-
-                        *bo = lobj->bo_va->base.bo;
-                        *map = mapping;
-                        goto found;
-                }
-
-                list_for_each_entry(mapping, &lobj->bo_va->invalids, list) {
-                        if (mapping->start > addr ||
-                            addr > mapping->last)
-                                continue;
+        mapping = amdgpu_vm_bo_lookup_mapping(vm, addr);
+        if (!mapping || !mapping->bo_va || !mapping->bo_va->base.bo)
+                return -EINVAL;
 
-                        *bo = lobj->bo_va->base.bo;
-                        *map = mapping;
-                        goto found;
-                }
-        }
+        *bo = mapping->bo_va->base.bo;
+        *map = mapping;
 
-        return -EINVAL;
+        /* Double check that the BO is reserved by this CS */
+        if (READ_ONCE((*bo)->tbo.resv->lock.ctx) != &parser->ticket)
+                return -EINVAL;
 
-found:
         r = amdgpu_ttm_bind(&(*bo)->tbo, &(*bo)->tbo.mem);
         if (unlikely(r))
                 return r;