drm/radeon: allow move_notify to be called without reservation

mlankhorst · airlied · commit 6ed9ccb41209 · 2012-12-10T20:13:49.000+10:00
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 &lt;maarten.lankhorst@canonical.com&gt;
Signed-off-by: Dave Airlie &lt;airlied@redhat.com&gt;
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -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;
 	}
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1237,7 +1237,6 @@ void radeon_vm_bo_invalidate(struct radeon_device *rdev,`
`1237`	`1237`	`{`
`1238`	`1238`	`struct radeon_bo_va *bo_va;`
`1239`	`1239`
`1240`		`- BUG_ON(!radeon_bo_is_reserved(bo));`
`1241`	`1240`	`list_for_each_entry(bo_va, &bo->va, bo_list) {`
`1242`	`1241`	`bo_va->valid = false;`
`1243`	`1242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ void radeon_bo_get_tiling_flags(struct radeon_bo *bo,`
`530`	`530`	`int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,`
`531`	`531`	`bool force_drop)`
`532`	`532`	`{`
`533`		`- BUG_ON(!radeon_bo_is_reserved(bo));`
	`533`	`+ BUG_ON(!radeon_bo_is_reserved(bo) && !force_drop);`
`534`	`534`
`535`	`535`	`if (!(bo->tiling_flags & RADEON_TILING_SURFACE))`
`536`	`536`	`return 0;`