Commit 6ed9ccb4 authored Nov 28, 2012 by Maarten Lankhorst Committed by Dave Airlie Dec 10, 2012

drm/radeon: allow move_notify to be called without reservation

The few places that care should have those checks instead.
This allows destruction of bo backed memory without a reservation.
It's required for being able to rework the delayed destroy path,
as it is no longer guaranteed to hold a reservation before unlocking.

However any previous wait is still guaranteed to complete, and it's
one of the last things to be done before the buffer object is freed.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 4154f051

drivers/gpu/drm/radeon/radeon_gart.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1237,7 +1237,6 @@ void radeon_vm_bo_invalidate(struct radeon_device *rdev,
		{
		struct radeon_bo_va *bo_va;

		BUG_ON(!radeon_bo_is_reserved(bo));
		list_for_each_entry(bo_va, &bo->va, bo_list) {
		bo_va->valid = false;
		}

drivers/gpu/drm/radeon/radeon_object.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -530,7 +530,7 @@ void radeon_bo_get_tiling_flags(struct radeon_bo *bo,
		int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,
		bool force_drop)
		{
		BUG_ON(!radeon_bo_is_reserved(bo));
		BUG_ON(!radeon_bo_is_reserved(bo) && !force_drop);

		if (!(bo->tiling_flags & RADEON_TILING_SURFACE))
		return 0;