UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: add OOM fallback on PRT teardown (v2) 

Don't assume kmalloc will always succeed.

v2: agd: rebase

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2017-02-14 15:47:03 +01:00 committed by Alex Deucher
parent 1b04e4129d
commit 0b15f2fc3c
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1193,6 +1193,15 @@ static void amdgpu_vm_update_prt_state(struct amdgpu_device *adev)
spin_unlock_irqrestore(&adev->vm_manager.prt_lock, flags); spin_unlock_irqrestore(&adev->vm_manager.prt_lock, flags);
} }
/**
* amdgpu_vm_prt_put - drop a PRT user
*/
static void amdgpu_vm_prt_put(struct amdgpu_device *adev)
{
if (atomic_dec_return(&adev->vm_manager.num_prt_mappings) == 0)
amdgpu_vm_update_prt_state(adev);
}
/** /**
* amdgpu_vm_prt - callback for updating the PRT status * amdgpu_vm_prt - callback for updating the PRT status
*/ */
@ -1200,8 +1209,7 @@ static void amdgpu_vm_prt_cb(struct dma_fence *fence, struct dma_fence_cb *_cb)
{ {
struct amdgpu_prt_cb *cb = container_of(_cb, struct amdgpu_prt_cb, cb); struct amdgpu_prt_cb *cb = container_of(_cb, struct amdgpu_prt_cb, cb);
if (atomic_dec_return(&cb->adev->vm_manager.num_prt_mappings) == 0) amdgpu_vm_prt_put(cb->adev);
amdgpu_vm_update_prt_state(cb->adev);
kfree(cb); kfree(cb);
} }
@ -1224,11 +1232,19 @@ static void amdgpu_vm_free_mapping(struct amdgpu_device *adev,
struct amdgpu_prt_cb *cb = kmalloc(sizeof(struct amdgpu_prt_cb), struct amdgpu_prt_cb *cb = kmalloc(sizeof(struct amdgpu_prt_cb),
GFP_KERNEL); GFP_KERNEL);
if (!cb) {
/* Last resort when we are OOM */
if (fence)
dma_fence_wait(fence, false);
amdgpu_vm_prt_put(cb->adev);
} else {
cb->adev = adev; cb->adev = adev;
if (!fence || dma_fence_add_callback(fence, &cb->cb, if (!fence || dma_fence_add_callback(fence, &cb->cb,
amdgpu_vm_prt_cb)) amdgpu_vm_prt_cb))
amdgpu_vm_prt_cb(fence, &cb->cb); amdgpu_vm_prt_cb(fence, &cb->cb);
} }
}
kfree(mapping); kfree(mapping);
} }