Commit 0a46fb5f authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Dave Airlie
Browse files

drm/radeon: Use ttm_bo_is_reserved

parent a9dbfff1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ void radeon_vm_bo_invalidate(struct radeon_device *rdev,
{
	struct radeon_bo_va *bo_va;

	BUG_ON(!atomic_read(&bo->tbo.reserved));
	BUG_ON(!radeon_bo_is_reserved(bo));
	list_for_each_entry(bo_va, &bo->va, bo_list) {
		bo_va->valid = false;
	}
+3 −3
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int radeon_bo_get_surface_reg(struct radeon_bo *bo)
	int steal;
	int i;

	BUG_ON(!atomic_read(&bo->tbo.reserved));
	BUG_ON(!radeon_bo_is_reserved(bo));

	if (!bo->tiling_flags)
		return 0;
@@ -510,7 +510,7 @@ void radeon_bo_get_tiling_flags(struct radeon_bo *bo,
				uint32_t *tiling_flags,
				uint32_t *pitch)
{
	BUG_ON(!atomic_read(&bo->tbo.reserved));
	BUG_ON(!radeon_bo_is_reserved(bo));
	if (tiling_flags)
		*tiling_flags = bo->tiling_flags;
	if (pitch)
@@ -520,7 +520,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(!atomic_read(&bo->tbo.reserved));
	BUG_ON(!radeon_bo_is_reserved(bo));

	if (!(bo->tiling_flags & RADEON_TILING_SURFACE))
		return 0;
+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline unsigned long radeon_bo_size(struct radeon_bo *bo)

static inline bool radeon_bo_is_reserved(struct radeon_bo *bo)
{
	return !!atomic_read(&bo->tbo.reserved);
	return ttm_bo_is_reserved(&bo->tbo);
}

static inline unsigned radeon_bo_ngpu_pages(struct radeon_bo *bo)