Commit 373533f8 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: make ttm_mem_type_manager_func debug more useful 



Provide the drm printer directly instead of just the callback.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aca81718

drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c

+3 −4
Original line number Diff line number Diff line
@@ -253,18 +253,17 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man, 
 * amdgpu_gtt_mgr_debug - dump VRAM table

 *

 * @man: TTM memory type manager

 * @prefix: text prefix

 * @printer: DRM printer to use

 *

 * Dump the table content using printk.

 */

static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,

				  const char *prefix)

				 struct drm_printer *printer)

{

	struct amdgpu_gtt_mgr *mgr = man->priv;

	struct drm_printer p = drm_debug_printer(prefix);



	spin_lock(&mgr->lock);

	drm_mm_print(&mgr->mm, &p);

	drm_mm_print(&mgr->mm, printer);

	spin_unlock(&mgr->lock);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+3 −4
Original line number Diff line number Diff line
@@ -204,18 +204,17 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man, 
 * amdgpu_vram_mgr_debug - dump VRAM table

 *

 * @man: TTM memory type manager

 * @prefix: text prefix

 * @printer: DRM printer to use

 *

 * Dump the table content using printk.

 */

static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,

				  const char *prefix)

				  struct drm_printer *printer)

{

	struct amdgpu_vram_mgr *mgr = man->priv;

	struct drm_printer p = drm_debug_printer(prefix);



	spin_lock(&mgr->lock);

	drm_mm_print(&mgr->mm, &p);

	drm_mm_print(&mgr->mm, printer);

	spin_unlock(&mgr->lock);

}

drivers/gpu/drm/nouveau/nouveau_ttm.c

+4 −2
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man, 
}



static void

nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)

nouveau_gart_manager_debug(struct ttm_mem_type_manager *man,

			   struct drm_printer *printer)

{

}
@@ -252,7 +253,8 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man, 
}



static void

nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)

nv04_gart_manager_debug(struct ttm_mem_type_manager *man,

			struct drm_printer *printer)

{

}

drivers/gpu/drm/ttm/ttm_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static inline int ttm_mem_type_from_place(const struct ttm_place *place, 
static void ttm_mem_type_debug(struct ttm_bo_device *bdev, int mem_type)

{

	struct ttm_mem_type_manager *man = &bdev->man[mem_type];

	struct drm_printer p = drm_debug_printer(TTM_PFX);



	pr_err("    has_type: %d\n", man->has_type);

	pr_err("    use_type: %d\n", man->use_type);
@@ -79,7 +80,7 @@ static void ttm_mem_type_debug(struct ttm_bo_device *bdev, int mem_type) 
	pr_err("    available_caching: 0x%08X\n", man->available_caching);

	pr_err("    default_caching: 0x%08X\n", man->default_caching);

	if (mem_type != TTM_PL_SYSTEM)

		(*man->func->debug)(man, TTM_PFX);

		(*man->func->debug)(man, &p);

}



static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,

drivers/gpu/drm/ttm/ttm_bo_manager.c

+2 −3
Original line number Diff line number Diff line
@@ -136,13 +136,12 @@ static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man) 
}



static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,

			     const char *prefix)

			     struct drm_printer *printer)

{

	struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;

	struct drm_printer p = drm_debug_printer(prefix);



	spin_lock(&rman->lock);

	drm_mm_print(&rman->mm, &p);

	drm_mm_print(&rman->mm, printer);

	spin_unlock(&rman->lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE