drm/amdgpu: move debug print into the MM managers (97cbb284) · Commits · 戴 / test

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

+5 −9

Original line number	Diff line number	Diff line
		@@ -153,15 +153,6 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man,
		return r;
		}

		void amdgpu_gtt_mgr_print(struct seq_file m, struct ttm_mem_type_manager man)
		{
		struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
		struct amdgpu_gtt_mgr *mgr = man->priv;

		seq_printf(m, "man size:%llu pages, gtt available:%llu pages, usage:%lluMB\n",
		man->size, mgr->available, (u64)atomic64_read(&adev->gtt_usage) >> 20);

		}
		/**
		* amdgpu_gtt_mgr_new - allocate a new node
		*
		@@ -260,11 +251,16 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,
		static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
		struct drm_printer *printer)
		{
		struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
		struct amdgpu_gtt_mgr *mgr = man->priv;

		spin_lock(&mgr->lock);
		drm_mm_print(&mgr->mm, printer);
		spin_unlock(&mgr->lock);

		drm_printf(printer, "man size:%llu pages, gtt available:%llu pages, usage:%lluMB\n",
		man->size, mgr->available,
		(u64)atomic64_read(&adev->gtt_usage) >> 20);
		}

		const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {

+0 −13

Original line number	Diff line number	Diff line
		@@ -1641,8 +1641,6 @@ error_free:

		#if defined(CONFIG_DEBUG_FS)

		extern void amdgpu_gtt_mgr_print(struct seq_file *m, struct ttm_mem_type_manager
		*man);
		static int amdgpu_mm_dump_table(struct seq_file m, void data)
		{
		struct drm_info_node node = (struct drm_info_node )m->private;
		@@ -1653,17 +1651,6 @@ static int amdgpu_mm_dump_table(struct seq_file m, void data)
		struct drm_printer p = drm_seq_file_printer(m);

		man->func->debug(man, &p);
		switch (ttm_pl) {
		case TTM_PL_VRAM:
		seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n",
		adev->mman.bdev.man[ttm_pl].size,
		(u64)atomic64_read(&adev->vram_usage) >> 20,
		(u64)atomic64_read(&adev->vram_vis_usage) >> 20);
		break;
		case TTM_PL_TT:
		amdgpu_gtt_mgr_print(m, &adev->mman.bdev.man[TTM_PL_TT]);
		break;
		}
		return 0;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -211,11 +211,17 @@ static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man,
		static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
		struct drm_printer *printer)
		{
		struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
		struct amdgpu_vram_mgr *mgr = man->priv;

		spin_lock(&mgr->lock);
		drm_mm_print(&mgr->mm, printer);
		spin_unlock(&mgr->lock);

		drm_printf(printer, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n",
		adev->mman.bdev.man[TTM_PL_VRAM].size,
		(u64)atomic64_read(&adev->vram_usage) >> 20,
		(u64)atomic64_read(&adev->vram_vis_usage) >> 20);
		}

		const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {