Commit 78f99c6d authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/ttm: cleanup some old defines

Use pr_debug instead of TTM_DEBUG, fix the lockdep assert and remove the
unused constant.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarRoger He <Hongbo.He@amd.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2b7e35fb
...@@ -42,10 +42,6 @@ ...@@ -42,10 +42,6 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/reservation.h> #include <linux/reservation.h>
#define TTM_ASSERT_LOCKED(param)
#define TTM_DEBUG(fmt, arg...)
#define TTM_BO_HASH_ORDER 13
static int ttm_bo_swapout(struct ttm_mem_shrink *shrink); static int ttm_bo_swapout(struct ttm_mem_shrink *shrink);
static void ttm_bo_global_kobj_release(struct kobject *kobj); static void ttm_bo_global_kobj_release(struct kobject *kobj);
...@@ -233,7 +229,7 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc) ...@@ -233,7 +229,7 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)
int ret = 0; int ret = 0;
uint32_t page_flags = 0; uint32_t page_flags = 0;
TTM_ASSERT_LOCKED(&bo->mutex); reservation_object_assert_held(bo->resv);
bo->ttm = NULL; bo->ttm = NULL;
if (bdev->need_dma32) if (bdev->need_dma32)
...@@ -1544,12 +1540,12 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev) ...@@ -1544,12 +1540,12 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
cancel_delayed_work_sync(&bdev->wq); cancel_delayed_work_sync(&bdev->wq);
if (ttm_bo_delayed_delete(bdev, true)) if (ttm_bo_delayed_delete(bdev, true))
TTM_DEBUG("Delayed destroy list was clean\n"); pr_debug("Delayed destroy list was clean\n");
spin_lock(&glob->lru_lock); spin_lock(&glob->lru_lock);
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
if (list_empty(&bdev->man[0].lru[0])) if (list_empty(&bdev->man[0].lru[0]))
TTM_DEBUG("Swap list %d was clean\n", i); pr_debug("Swap list %d was clean\n", i);
spin_unlock(&glob->lru_lock); spin_unlock(&glob->lru_lock);
drm_vma_offset_manager_destroy(&bdev->vma_manager); drm_vma_offset_manager_destroy(&bdev->vma_manager);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment