openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: use the DFS iterator in amdgpu_vm_invalidate_pds v2 

Less code and easier to maintain.

v2: rename the function as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-09-08 13:05:34 +02:00 committed by Alex Deucher
parent 229a37f834
commit d4085ea9bc
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
View File

@ -1370,37 +1370,22 @@ static void amdgpu_vm_update_pde(struct amdgpu_pte_update_params *params,
} }
/* /*
* amdgpu_vm_invalidate_level - mark all PD levels as invalid * amdgpu_vm_invalidate_pds - mark all PDs as invalid
* *
* @adev: amdgpu_device pointer * @adev: amdgpu_device pointer
* @vm: related vm * @vm: related vm
* @parent: parent PD
* @level: VMPT level
* *
* Mark all PD level as invalid after an error. * Mark all PD level as invalid after an error.
*/ */
static void amdgpu_vm_invalidate_level(struct amdgpu_device *adev, static void amdgpu_vm_invalidate_pds(struct amdgpu_device *adev,
struct amdgpu_vm *vm, struct amdgpu_vm *vm)
struct amdgpu_vm_pt *parent,
unsigned level)
{ {
unsigned pt_idx, num_entries; struct amdgpu_vm_pt_cursor cursor;
struct amdgpu_vm_pt *entry;
/* for_each_amdgpu_vm_pt_dfs_safe(adev, vm, cursor, entry)
* Recurse into the subdirectories. This recursion is harmless because if (entry->base.bo && !entry->base.moved)
* we only have a maximum of 5 layers.
*/
num_entries = amdgpu_vm_num_entries(adev, level);
for (pt_idx = 0; pt_idx < num_entries; ++pt_idx) {
struct amdgpu_vm_pt *entry = &parent->entries[pt_idx];
if (!entry->base.bo)
continue;
if (!entry->base.moved)
amdgpu_vm_bo_relocated(&entry->base); amdgpu_vm_bo_relocated(&entry->base);
amdgpu_vm_invalidate_level(adev, vm, entry, level + 1);
}
} }
/* /*
@ -1497,8 +1482,7 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev,
return 0; return 0;
error: error:
amdgpu_vm_invalidate_level(adev, vm, &vm->root, amdgpu_vm_invalidate_pds(adev, vm);
adev->vm_manager.root_level);
amdgpu_job_free(job); amdgpu_job_free(job);
return r; return r;
} }