Commit 62d266b2 authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup debugfs for amdgpu rings 



Use debugfs_create_file_size API for creating ring debugfs, and as its a
NULL returning API, change the return type for amdgpu_debugfs_ring_init
API as well. Also cleanup surrounding code.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 59715cff

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

+1 −3
Original line number Diff line number Diff line
@@ -1734,9 +1734,7 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) 
		if (!ring)

			continue;



		if (amdgpu_debugfs_ring_init(adev, ring)) {

			DRM_ERROR("Failed to register debugfs file for rings !\n");

		}

		amdgpu_debugfs_ring_init(adev, ring);

	}



	amdgpu_ras_debugfs_create_all(adev);

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

+6 −12
Original line number Diff line number Diff line
@@ -415,26 +415,20 @@ static const struct file_operations amdgpu_debugfs_ring_fops = { 


#endif



int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,

void amdgpu_debugfs_ring_init(struct amdgpu_device *adev,

			      struct amdgpu_ring *ring)

{

#if defined(CONFIG_DEBUG_FS)

	struct drm_minor *minor = adev_to_drm(adev)->primary;

	struct dentry *ent, *root = minor->debugfs_root;

	struct dentry *root = minor->debugfs_root;

	char name[32];



	sprintf(name, "amdgpu_ring_%s", ring->name);

	debugfs_create_file_size(name, S_IFREG | S_IRUGO, root, ring,

				 &amdgpu_debugfs_ring_fops,

				 ring->ring_size + 12);



	ent = debugfs_create_file(name,

				  S_IFREG | S_IRUGO, root,

				  ring, &amdgpu_debugfs_ring_fops);

	if (IS_ERR(ent))

		return PTR_ERR(ent);



	i_size_write(ent->d_inode, ring->ring_size + 12);

	ring->ent = ent;

#endif

	return 0;

}



/**

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

+2 −8
Original line number Diff line number Diff line
@@ -253,10 +253,6 @@ struct amdgpu_ring { 
	bool			has_compute_vm_bug;

	bool			no_scheduler;

	int			hw_prio;



#if defined(CONFIG_DEBUG_FS)

	struct dentry *ent;

#endif

};



#define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib)))
@@ -356,8 +352,6 @@ static inline void amdgpu_ring_write_multiple(struct amdgpu_ring *ring, 


int amdgpu_ring_test_helper(struct amdgpu_ring *ring);



int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,

void amdgpu_debugfs_ring_init(struct amdgpu_device *adev,

			      struct amdgpu_ring *ring);

void amdgpu_debugfs_ring_fini(struct amdgpu_ring *ring);



#endif