drm/radeon: get rid of ttm_bo_is_reserved usage

[linux-imx.git] / drivers / gpu / drm / radeon / radeon_object.c

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index d850dc66f4dac7072749f38640bcca9516405330..0219d263e2df81c4427a3cc94c429b27b7853f72 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -400,7 +400,7 @@ int radeon_bo_get_surface_reg(struct radeon_bo *bo)
        int steal;
        int i;
 
-       BUG_ON(!radeon_bo_is_reserved(bo));
+       lockdep_assert_held(&bo->tbo.resv->lock.base);
 
        if (!bo->tiling_flags)
                return 0;
@@ -526,7 +526,8 @@ void radeon_bo_get_tiling_flags(struct radeon_bo *bo,
                                uint32_t *tiling_flags,
                                uint32_t *pitch)
 {
-       BUG_ON(!radeon_bo_is_reserved(bo));
+       lockdep_assert_held(&bo->tbo.resv->lock.base);
+
        if (tiling_flags)
                *tiling_flags = bo->tiling_flags;
        if (pitch)
@@ -536,7 +537,8 @@ 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) && !force_drop);
+       if (!force_drop)
+               lockdep_assert_held(&bo->tbo.resv->lock.base);
 
        if (!(bo->tiling_flags & RADEON_TILING_SURFACE))
                return 0;