hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/radeon: Use ttm_bo_is_reserved 

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Maarten Lankhorst 2012-10-12 14:59:17 +00:00 committed by Dave Airlie
parent a9dbfff1cb
commit 0a46fb5f41
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/radeon/radeon_gart.c
View File

@ -1237,7 +1237,7 @@ void radeon_vm_bo_invalidate(struct radeon_device *rdev,
{ {
struct radeon_bo_va *bo_va; 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) { list_for_each_entry(bo_va, &bo->va, bo_list) {
bo_va->valid = false; bo_va->valid = false;
} }

6
drivers/gpu/drm/radeon/radeon_object.c
View File

@ -384,7 +384,7 @@ int radeon_bo_get_surface_reg(struct radeon_bo *bo)
int steal; int steal;
int i; int i;
BUG_ON(!atomic_read(&bo->tbo.reserved)); BUG_ON(!radeon_bo_is_reserved(bo));
if (!bo->tiling_flags) if (!bo->tiling_flags)
return 0; return 0;
@ -510,7 +510,7 @@ void radeon_bo_get_tiling_flags(struct radeon_bo *bo,
uint32_t *tiling_flags, uint32_t *tiling_flags,
uint32_t *pitch) uint32_t *pitch)
{ {
BUG_ON(!atomic_read(&bo->tbo.reserved)); BUG_ON(!radeon_bo_is_reserved(bo));
if (tiling_flags) if (tiling_flags)
*tiling_flags = bo->tiling_flags; *tiling_flags = bo->tiling_flags;
if (pitch) 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, int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,
bool force_drop) bool force_drop)
{ {
BUG_ON(!atomic_read(&bo->tbo.reserved)); BUG_ON(!radeon_bo_is_reserved(bo));
if (!(bo->tiling_flags & RADEON_TILING_SURFACE)) if (!(bo->tiling_flags & RADEON_TILING_SURFACE))
return 0; return 0;

2
drivers/gpu/drm/radeon/radeon_object.h
View File

@ -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) 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) static inline unsigned radeon_bo_ngpu_pages(struct radeon_bo *bo)