Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b15f2fc authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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



Don't assume kmalloc will always succeed.

v2: agd: rebase

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarNicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b04e412

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

+22 −6
Original line number Diff line number Diff line
@@ -1193,6 +1193,15 @@ static void amdgpu_vm_update_prt_state(struct amdgpu_device *adev) 
	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

 */
@@ -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);



	if (atomic_dec_return(&cb->adev->vm_manager.num_prt_mappings) == 0)

		amdgpu_vm_update_prt_state(cb->adev);

	amdgpu_vm_prt_put(cb->adev);

	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),

						   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;

			if (!fence || dma_fence_add_callback(fence, &cb->cb,

							     amdgpu_vm_prt_cb))

				amdgpu_vm_prt_cb(fence, &cb->cb);

		}

	}

	kfree(mapping);

}