diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2018-11-30 12:15:22 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-12-21 15:27:58 -0500 |
commit | 0f6be2c09af65a85d34653e609b5f45e25a9e95a (patch) | |
tree | 5b85887ea22cf567bcf48b29e38087b1f60f52c6 | |
parent | 06d6370e7b200882ab23bafd86a4024c7571c778 (diff) |
drm/ttm: Use drm_debug_printer for all ttm_bo_mem_space_debug output
No need for pr_err here, the pr_err message in ttm_bo_evict is enough
to draw attention to something not going as planned.
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index d87935bf8e30..0ec08394e17a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
@@ -77,38 +77,39 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place, | |||
77 | return 0; | 77 | return 0; |
78 | } | 78 | } |
79 | 79 | ||
80 | static void ttm_mem_type_debug(struct ttm_bo_device *bdev, int mem_type) | 80 | static void ttm_mem_type_debug(struct ttm_bo_device *bdev, struct drm_printer *p, |
81 | int mem_type) | ||
81 | { | 82 | { |
82 | struct ttm_mem_type_manager *man = &bdev->man[mem_type]; | 83 | struct ttm_mem_type_manager *man = &bdev->man[mem_type]; |
83 | struct drm_printer p = drm_debug_printer(TTM_PFX); | ||
84 | 84 | ||
85 | pr_err(" has_type: %d\n", man->has_type); | 85 | drm_printf(p, " has_type: %d\n", man->has_type); |
86 | pr_err(" use_type: %d\n", man->use_type); | 86 | drm_printf(p, " use_type: %d\n", man->use_type); |
87 | pr_err(" flags: 0x%08X\n", man->flags); | 87 | drm_printf(p, " flags: 0x%08X\n", man->flags); |
88 | pr_err(" gpu_offset: 0x%08llX\n", man->gpu_offset); | 88 | drm_printf(p, " gpu_offset: 0x%08llX\n", man->gpu_offset); |
89 | pr_err(" size: %llu\n", man->size); | 89 | drm_printf(p, " size: %llu\n", man->size); |
90 | pr_err(" available_caching: 0x%08X\n", man->available_caching); | 90 | drm_printf(p, " available_caching: 0x%08X\n", man->available_caching); |
91 | pr_err(" default_caching: 0x%08X\n", man->default_caching); | 91 | drm_printf(p, " default_caching: 0x%08X\n", man->default_caching); |
92 | if (mem_type != TTM_PL_SYSTEM) | 92 | if (mem_type != TTM_PL_SYSTEM) |
93 | (*man->func->debug)(man, &p); | 93 | (*man->func->debug)(man, p); |
94 | } | 94 | } |
95 | 95 | ||
96 | static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo, | 96 | static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo, |
97 | struct ttm_placement *placement) | 97 | struct ttm_placement *placement) |
98 | { | 98 | { |
99 | struct drm_printer p = drm_debug_printer(TTM_PFX); | ||
99 | int i, ret, mem_type; | 100 | int i, ret, mem_type; |
100 | 101 | ||
101 | pr_err("No space for %p (%lu pages, %luK, %luM)\n", | 102 | drm_printf(&p, "No space for %p (%lu pages, %luK, %luM)\n", |
102 | bo, bo->mem.num_pages, bo->mem.size >> 10, | 103 | bo, bo->mem.num_pages, bo->mem.size >> 10, |
103 | bo->mem.size >> 20); | 104 | bo->mem.size >> 20); |
104 | for (i = 0; i < placement->num_placement; i++) { | 105 | for (i = 0; i < placement->num_placement; i++) { |
105 | ret = ttm_mem_type_from_place(&placement->placement[i], | 106 | ret = ttm_mem_type_from_place(&placement->placement[i], |
106 | &mem_type); | 107 | &mem_type); |
107 | if (ret) | 108 | if (ret) |
108 | return; | 109 | return; |
109 | pr_err(" placement[%d]=0x%08X (%d)\n", | 110 | drm_printf(&p, " placement[%d]=0x%08X (%d)\n", |
110 | i, placement->placement[i].flags, mem_type); | 111 | i, placement->placement[i].flags, mem_type); |
111 | ttm_mem_type_debug(bo->bdev, mem_type); | 112 | ttm_mem_type_debug(bo->bdev, &p, mem_type); |
112 | } | 113 | } |
113 | } | 114 | } |
114 | 115 | ||