drm/amdgpu: search only the BO list for VM mappings

Make UVD/VCE VM emulation more efficient.

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

1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index a610465c5e0b..ac26e52d5923 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -928,30 +928,36 @@ struct amdgpu_bo_va_mapping *
 amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
                        uint64_t addr, struct amdgpu_bo **bo)
 {
-        struct amdgpu_bo_list_entry *reloc;
         struct amdgpu_bo_va_mapping *mapping;
+        unsigned i;
+
+        if (!parser->bo_list)
+                return NULL;
 
         addr /= AMDGPU_GPU_PAGE_SIZE;
 
-        list_for_each_entry(reloc, &parser->validated, tv.head) {
-                if (!reloc->bo_va)
+        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, &reloc->bo_va->valids, list) {
+                list_for_each_entry(mapping, &lobj->bo_va->valids, list) {
                         if (mapping->it.start > addr ||
                             addr > mapping->it.last)
                                 continue;
 
-                        *bo = reloc->bo_va->bo;
+                        *bo = lobj->bo_va->bo;
                         return mapping;
                 }
 
-                list_for_each_entry(mapping, &reloc->bo_va->invalids, list) {
+                list_for_each_entry(mapping, &lobj->bo_va->invalids, list) {
                         if (mapping->it.start > addr ||
                             addr > mapping->it.last)
                                 continue;
 
-                        *bo = reloc->bo_va->bo;
+                        *bo = lobj->bo_va->bo;
                         return mapping;
                 }
         }