drm/amdgpu: remove unused code

Remove the unused function - amdgpu_vm_pt_is_root_clean
and remove the impossible condition

v1: entries == 0 is not possible any more,
    so this condition could probably be removed (Felix)

Signed-off-by: Jesse Zhang <jesse.zhang@amd.com>
Suggested-by：Felix Kuehling <felix.kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 7f95039bb37d42890c8332c6af8d8d04bfcc098b..047ec1930d1243e5a9e0d9fcb03b99d800a6858d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -537,8 +537,6 @@ int amdgpu_vm_pt_create(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                        int level, bool immediate, struct amdgpu_bo_vm **vmbo,
                        int32_t xcp_id);
 void amdgpu_vm_pt_free_root(struct amdgpu_device *adev, struct amdgpu_vm *vm);
-bool amdgpu_vm_pt_is_root_clean(struct amdgpu_device *adev,
-                               struct amdgpu_vm *vm);
 
 int amdgpu_vm_pde_update(struct amdgpu_vm_update_params *params,
                         struct amdgpu_vm_bo_base *entry);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
index 8bce4da671318a2b13b586e737608cb0f4f8e2be..124389a6bf481a62e7aeb2bfe3c4c2d109901e81 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
@@ -409,27 +409,24 @@ int amdgpu_vm_pt_clear(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 
        addr = 0;
 
-       if (entries) {
-               uint64_t value = 0, flags = 0;
-
-               if (adev->asic_type >= CHIP_VEGA10) {
-                       if (level != AMDGPU_VM_PTB) {
-                               /* Handle leaf PDEs as PTEs */
-                               flags |= AMDGPU_PDE_PTE;
-                               amdgpu_gmc_get_vm_pde(adev, level,
-                                                     &value, &flags);
-                       } else {
-                               /* Workaround for fault priority problem on GMC9 */
-                               flags = AMDGPU_PTE_EXECUTABLE;
-                       }
+       uint64_t value = 0, flags = 0;
+       if (adev->asic_type >= CHIP_VEGA10) {
+               if (level != AMDGPU_VM_PTB) {
+                       /* Handle leaf PDEs as PTEs */
+                       flags |= AMDGPU_PDE_PTE;
+                       amdgpu_gmc_get_vm_pde(adev, level,
+                                             &value, &flags);
+               } else {
+                       /* Workaround for fault priority problem on GMC9 */
+                       flags = AMDGPU_PTE_EXECUTABLE;
                }
-
-               r = vm->update_funcs->update(&params, vmbo, addr, 0, entries,
-                                            value, flags);
-               if (r)
-                       goto exit;
        }
 
+       r = vm->update_funcs->update(&params, vmbo, addr, 0, entries,
+                                    value, flags);
+       if (r)
+               goto exit;
+
        r = vm->update_funcs->commit(&params, NULL);
 exit:
        drm_dev_exit(idx);
@@ -673,33 +670,6 @@ void amdgpu_vm_pt_free_root(struct amdgpu_device *adev, struct amdgpu_vm *vm)
        amdgpu_vm_pt_free_dfs(adev, vm, NULL, false);
 }
 
-/**
- * amdgpu_vm_pt_is_root_clean - check if a root PD is clean
- *
- * @adev: amdgpu_device pointer
- * @vm: the VM to check
- *
- * Check all entries of the root PD, if any subsequent PDs are allocated,
- * it means there are page table creating and filling, and is no a clean
- * VM
- *
- * Returns:
- *     0 if this VM is clean
- */
-bool amdgpu_vm_pt_is_root_clean(struct amdgpu_device *adev,
-                               struct amdgpu_vm *vm)
-{
-       enum amdgpu_vm_level root = adev->vm_manager.root_level;
-       unsigned int entries = amdgpu_vm_pt_num_entries(adev, root);
-       unsigned int i = 0;
-
-       for (i = 0; i < entries; i++) {
-               if (to_amdgpu_bo_vm(vm->root.bo)->entries[i].bo)
-                       return false;
-       }
-       return true;
-}
-
 /**
  * amdgpu_vm_pde_update - update a single level in the hierarchy
  *