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

Commit 85761f60 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: stop re-reserving the BO in radeon_vm_bo_set_addr 



That's useless when all callers drop the reservation
immediately after calling the function.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent faffaf62

drivers/gpu/drm/radeon/radeon_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data, 
		if (bo_va->it.start) {

			args->operation = RADEON_VA_RESULT_VA_EXIST;

			args->offset = bo_va->it.start * RADEON_GPU_PAGE_SIZE;

			radeon_bo_unreserve(rbo);

			goto out;

		}

		r = radeon_vm_bo_set_addr(rdev, bo_va, args->offset, args->flags);
@@ -616,7 +617,6 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data, 
		args->operation = RADEON_VA_RESULT_ERROR;

	}

out:

	radeon_bo_unreserve(rbo);

	drm_gem_object_unreference_unlocked(gobj);

	return r;

}

drivers/gpu/drm/radeon/radeon_kms.c

+0 −2
Original line number Diff line number Diff line
@@ -628,8 +628,6 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
						  RADEON_VA_IB_OFFSET,

						  RADEON_VM_PAGE_READABLE |

						  RADEON_VM_PAGE_SNOOPED);



			radeon_bo_unreserve(rdev->ring_tmp_bo.bo);

			if (r) {

				radeon_vm_fini(rdev, vm);

				kfree(fpriv);

drivers/gpu/drm/radeon/radeon_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static int radeon_vm_clear_bo(struct radeon_device *rdev, 
 * Validate and set the offset requested within the vm address space.

 * Returns 0 for success, error for failure.

 *

 * Object has to be reserved!

 * Object has to be reserved and gets unreserved by this function!

 */

int radeon_vm_bo_set_addr(struct radeon_device *rdev,

			  struct radeon_bo_va *bo_va,
@@ -576,7 +576,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
	}



	mutex_unlock(&vm->mutex);

	return radeon_bo_reserve(bo_va->bo, false);

	return 0;

}



/**