Skip to content

Commit 7ccde2e

Browse files
ChristianKoenigAMDalexdeucher
authored andcommitted
drm/amdgpu: revert "use CPU for page table update if SDMA is unavailable"
That is clearly not something we should do upstream. The SDMA is mandatory for the driver to work correctly. We could do this for emulation and bringup, but in those cases the engineer should probably enabled CPU based updates manually. This reverts commit 62eefd1. Signed-off-by: Christian König <[email protected]> Reviewed-by: Yifan Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 27f9dcb commit 7ccde2e

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2423,7 +2423,6 @@ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)
24232423
int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
24242424
int32_t xcp_id)
24252425
{
2426-
struct amdgpu_ip_block *ip_block;
24272426
struct amdgpu_bo *root_bo;
24282427
struct amdgpu_bo_vm *root;
24292428
int r, i;
@@ -2455,11 +2454,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
24552454
vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode &
24562455
AMDGPU_VM_USE_CPU_FOR_GFX);
24572456

2458-
/* use CPU for page table update if SDMA is unavailable */
2459-
ip_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_SDMA);
2460-
if (!ip_block || ip_block->status.valid == false)
2461-
vm->use_cpu_for_update = true;
2462-
24632457
DRM_DEBUG_DRIVER("VM update mode is %s\n",
24642458
vm->use_cpu_for_update ? "CPU" : "SDMA");
24652459
WARN_ONCE((vm->use_cpu_for_update &&

0 commit comments

Comments
 (0)