Commit 763efb6c authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup debugfs handling a bit 



Remove the superflous .debugfs_init callback and register all files in
amdgpu_device.c in just one function.

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 4fd09a19

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

+0 −5
Original line number Diff line number Diff line
@@ -1250,11 +1250,6 @@ int amdgpu_debugfs_add_files(struct amdgpu_device *adev, 
			     const struct drm_info_list *files,

			     unsigned nfiles);

int amdgpu_debugfs_fence_init(struct amdgpu_device *adev);



#if defined(CONFIG_DEBUG_FS)

int amdgpu_debugfs_init(struct drm_minor *minor);

#endif



int amdgpu_debugfs_firmware_init(struct amdgpu_device *adev);



/*

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

+11 −35
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin"); 


static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);

static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev);

static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev);

static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev);

static int amdgpu_debugfs_init(struct amdgpu_device *adev);



static const char *amdgpu_asic_name[] = {

	"TAHITI",
@@ -2405,17 +2404,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (r)

		DRM_ERROR("registering register debugfs failed (%d).\n", r);



	r = amdgpu_debugfs_test_ib_ring_init(adev);

	if (r)

		DRM_ERROR("registering register test ib ring debugfs failed (%d).\n", r);



	r = amdgpu_debugfs_firmware_init(adev);

	if (r)

		DRM_ERROR("registering firmware debugfs failed (%d).\n", r);



	r = amdgpu_debugfs_vbios_dump_init(adev);

	r = amdgpu_debugfs_init(adev);

	if (r)

		DRM_ERROR("Creating vbios dump debugfs failed (%d).\n", r);

		DRM_ERROR("Creating debugfs files failed (%d).\n", r);



	if ((amdgpu_testing & 1)) {

		if (adev->accel_working)
@@ -3964,21 +3959,6 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data) 
	return 0;

}



static const struct drm_info_list amdgpu_debugfs_test_ib_ring_list[] = {

	{"amdgpu_test_ib", &amdgpu_debugfs_test_ib}

};



static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev)

{

	return amdgpu_debugfs_add_files(adev,

					amdgpu_debugfs_test_ib_ring_list, 1);

}



int amdgpu_debugfs_init(struct drm_minor *minor)

{

	return 0;

}



static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;
@@ -3989,19 +3969,19 @@ static int amdgpu_debugfs_get_vbios_dump(struct seq_file *m, void *data) 
	return 0;

}



static const struct drm_info_list amdgpu_vbios_dump_list[] = {

		{"amdgpu_vbios",

		 amdgpu_debugfs_get_vbios_dump,

		 0, NULL},

static const struct drm_info_list amdgpu_debugfs_list[] = {

	{"amdgpu_vbios", amdgpu_debugfs_get_vbios_dump},

	{"amdgpu_test_ib", &amdgpu_debugfs_test_ib}

};



static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev)

static int amdgpu_debugfs_init(struct amdgpu_device *adev)

{

	return amdgpu_debugfs_add_files(adev,

					amdgpu_vbios_dump_list, 1);

	return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,

					ARRAY_SIZE(amdgpu_debugfs_list));

}



#else

static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev)

static int amdgpu_debugfs_init(struct amdgpu_device *adev)

{

	return 0;

}
@@ -4009,9 +3989,5 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) 
{

	return 0;

}

static int amdgpu_debugfs_vbios_dump_init(struct amdgpu_device *adev)

{

	return 0;

}

static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev) { }

#endif

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

+0 −3
Original line number Diff line number Diff line
@@ -850,9 +850,6 @@ static struct drm_driver kms_driver = { 
	.disable_vblank = amdgpu_disable_vblank_kms,

	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,

	.get_scanout_position = amdgpu_get_crtc_scanout_position,

#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = amdgpu_debugfs_init,

#endif

	.irq_preinstall = amdgpu_irq_preinstall,

	.irq_postinstall = amdgpu_irq_postinstall,

	.irq_uninstall = amdgpu_irq_uninstall,

CRA Git | Maintained and supported by SUSTech CRA and CCSE