Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christian König <christian.koenig@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
78f99c6d 2b7e35fb

+3 -7
+3 -7
drivers/gpu/drm/ttm/ttm_bo.c
··· 42 42 #include <linux/atomic.h> 43 43 #include <linux/reservation.h> 44 44 45 - #define TTM_ASSERT_LOCKED(param) 46 - #define TTM_DEBUG(fmt, arg...) 47 - #define TTM_BO_HASH_ORDER 13 48 - 49 45 static int ttm_bo_swapout(struct ttm_mem_shrink *shrink); 50 46 static void ttm_bo_global_kobj_release(struct kobject *kobj); 51 47 ··· 229 233 int ret = 0; 230 234 uint32_t page_flags = 0; 231 235 232 - TTM_ASSERT_LOCKED(&bo->mutex); 236 + reservation_object_assert_held(bo->resv); 233 237 bo->ttm = NULL; 234 238 235 239 if (bdev->need_dma32) ··· 1540 1544 cancel_delayed_work_sync(&bdev->wq); 1541 1545 1542 1546 if (ttm_bo_delayed_delete(bdev, true)) 1543 - TTM_DEBUG("Delayed destroy list was clean\n"); 1547 + pr_debug("Delayed destroy list was clean\n"); 1544 1548 1545 1549 spin_lock(&glob->lru_lock); 1546 1550 for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) 1547 1551 if (list_empty(&bdev->man[0].lru[0])) 1548 - TTM_DEBUG("Swap list %d was clean\n", i); 1552 + pr_debug("Swap list %d was clean\n", i); 1549 1553 spin_unlock(&glob->lru_lock); 1550 1554 1551 1555 drm_vma_offset_manager_destroy(&bdev->vma_manager);