Commit c5820361 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/ttm: move debugfs init into core amdgpu debugfs 



In order to remove the load and unload drm callbacks,
we need to reorder the init sequence to move all the drm
debugfs file handling.  Do this for ttm.

Tested-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 923ffa6b

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

+10 −0
Original line number Diff line number Diff line
@@ -1272,6 +1272,8 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_ib_preempt, NULL, 


int amdgpu_debugfs_init(struct amdgpu_device *adev)

{

	int r;



	adev->debugfs_preempt =

		debugfs_create_file("amdgpu_preempt_ib", 0600,

				    adev->ddev->primary->debugfs_root, adev,
@@ -1281,12 +1283,20 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) 
		return -EIO;

	}



	/* Register debugfs entries for amdgpu_ttm */

	r = amdgpu_ttm_debugfs_init(adev);

	if (r) {

		DRM_ERROR("Failed to init debugfs\n");

		return r;

	}



	return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,

					ARRAY_SIZE(amdgpu_debugfs_list));

}



void amdgpu_debugfs_fini(struct amdgpu_device *adev)

{

	amdgpu_ttm_debugfs_fini(adev);

	debugfs_remove(adev->debugfs_preempt);

}

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

+2 −12
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, 
			     struct amdgpu_ring *ring,

			     uint64_t *addr);



static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);

static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);



static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)

{

	return 0;
@@ -1921,12 +1918,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		return r;

	}



	/* Register debugfs entries for amdgpu_ttm */

	r = amdgpu_ttm_debugfs_init(adev);

	if (r) {

		DRM_ERROR("Failed to init debugfs\n");

		return r;

	}

	return 0;

}
@@ -1948,7 +1939,6 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
	if (!adev->mman.initialized)

		return;



	amdgpu_ttm_debugfs_fini(adev);

	amdgpu_ttm_training_reserve_vram_fini(adev);

	/* return the IP Discovery TMR memory back to VRAM */

	amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
@@ -2546,7 +2536,7 @@ static const struct { 


#endif



static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)

int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)

{

#if defined(CONFIG_DEBUG_FS)

	unsigned count;
@@ -2582,7 +2572,7 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev) 
#endif

}



static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev)

void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev)

{

#if defined(CONFIG_DEBUG_FS)

	unsigned i;

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h

+3 −0
Original line number Diff line number Diff line
@@ -133,4 +133,7 @@ uint64_t amdgpu_ttm_tt_pde_flags(struct ttm_tt *ttm, struct ttm_mem_reg *mem); 
uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,

				 struct ttm_mem_reg *mem);



int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);

void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE