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

Commit c81a1a74 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu: Make amdgpu_bo_reserve use uninterruptible waits for cleanup 



Some of these paths probably cannot be interrupted by a signal anyway.
Those that can would fail to clean up things if they actually got
interrupted.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8b9242ed

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static void amdgpu_unpin_work_func(struct work_struct *__work) 
	int r;



	/* unpin of the old buffer */

	r = amdgpu_bo_reserve(work->old_abo, false);

	r = amdgpu_bo_reserve(work->old_abo, true);

	if (likely(r == 0)) {

		r = amdgpu_bo_unpin(work->old_abo);

		if (unlikely(r != 0)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void amdgpufb_destroy_pinned_object(struct drm_gem_object *gobj) 
	struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj);

	int ret;



	ret = amdgpu_bo_reserve(abo, false);

	ret = amdgpu_bo_reserve(abo, true);

	if (likely(ret == 0)) {

		amdgpu_bo_kunmap(abo);

		amdgpu_bo_unpin(abo);

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

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev) 
	if (adev->gart.robj == NULL) {

		return;

	}

	r = amdgpu_bo_reserve(adev->gart.robj, false);

	r = amdgpu_bo_reserve(adev->gart.robj, true);

	if (likely(r == 0)) {

		amdgpu_bo_kunmap(adev->gart.robj);

		amdgpu_bo_unpin(adev->gart.robj);

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

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 


	if (amdgpu_sriov_vf(adev)) {

		/* TODO: how to handle reserve failure */

		BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, false));

		BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));

		amdgpu_vm_bo_rmv(adev, fpriv->vm.csa_bo_va);

		fpriv->vm.csa_bo_va = NULL;

		amdgpu_bo_unreserve(adev->virt.csa_obj);

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ void amdgpu_gem_prime_unpin(struct drm_gem_object *obj) 
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);

	int ret = 0;



	ret = amdgpu_bo_reserve(bo, false);

	ret = amdgpu_bo_reserve(bo, true);

	if (unlikely(ret != 0))

		return;