Commit eb2e7f20 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: push userq debugfs function in amdgpu_debugfs files 



Debugfs files for amdgpu are better to be handled in the dedicated
amdgpu_debugfs.c/.h files.

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

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

+53 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include "amdgpu_reset.h"

#include "amdgpu_psp_ta.h"

#include "amdgpu_userq.h"



#if defined(CONFIG_DEBUG_FS)
@@ -2156,6 +2157,53 @@ static const struct file_operations amdgpu_pt_info_fops = { 
	.release = single_release,

};



static int amdgpu_mqd_info_read(struct seq_file *m, void *unused)

{

	struct amdgpu_usermode_queue *queue = m->private;

	struct amdgpu_bo *bo;

	int r;



	if (!queue || !queue->mqd.obj)

		return -EINVAL;



	bo = amdgpu_bo_ref(queue->mqd.obj);

	r = amdgpu_bo_reserve(bo, true);

	if (r) {

		amdgpu_bo_unref(&bo);

		return -EINVAL;

	}



	seq_printf(m, "queue_type: %d\n", queue->queue_type);

	seq_printf(m, "mqd_gpu_address: 0x%llx\n", amdgpu_bo_gpu_offset(queue->mqd.obj));



	amdgpu_bo_unreserve(bo);

	amdgpu_bo_unref(&bo);



	return 0;

}



static int amdgpu_mqd_info_open(struct inode *inode, struct file *file)

{

	return single_open(file, amdgpu_mqd_info_read, inode->i_private);

}



static const struct file_operations amdgpu_mqd_info_fops = {

	.owner = THIS_MODULE,

	.open = amdgpu_mqd_info_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};



void amdgpu_debugfs_userq_init(struct drm_file *file, struct amdgpu_usermode_queue *queue, int qid)

{

	char queue_name[32];



	scnprintf(queue_name, sizeof(queue_name), "queue_%d", qid);

	queue->debugfs_queue = debugfs_create_dir(queue_name, file->debugfs_client);

	debugfs_create_file("mqd_info", 0444, queue->debugfs_queue, queue, &amdgpu_mqd_info_fops);

}



void amdgpu_debugfs_vm_init(struct drm_file *file)

{

	debugfs_create_file("vm_pagetable_info", 0444, file->debugfs_client, file,
@@ -2174,4 +2222,9 @@ int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) 
void amdgpu_debugfs_vm_init(struct drm_file *file)

{

}

void amdgpu_debugfs_userq_init(struct drm_file *file,

			       struct amdgpu_usermode_queue *queue,

			       int qid)

{

}

#endif

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

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
/*

 * Debugfs

 */

struct amdgpu_usermode_queue;



int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);

int amdgpu_debugfs_init(struct amdgpu_device *adev);
@@ -34,4 +35,7 @@ void amdgpu_debugfs_firmware_init(struct amdgpu_device *adev); 
void amdgpu_debugfs_gem_init(struct amdgpu_device *adev);

void amdgpu_debugfs_mes_event_log_init(struct amdgpu_device *adev);

void amdgpu_debugfs_vm_init(struct drm_file *file);

void amdgpu_debugfs_userq_init(struct drm_file *file,

			       struct amdgpu_usermode_queue *queue,

			       int qid);

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

+1 −48
Original line number Diff line number Diff line
@@ -709,46 +709,6 @@ static int amdgpu_userq_priority_permit(struct drm_file *filp, 
	return -EACCES;

}



#if defined(CONFIG_DEBUG_FS)

static int amdgpu_mqd_info_read(struct seq_file *m, void *unused)

{

	struct amdgpu_usermode_queue *queue = m->private;

	struct amdgpu_bo *bo;

	int r;



	if (!queue || !queue->mqd.obj)

		return -EINVAL;



	bo = amdgpu_bo_ref(queue->mqd.obj);

	r = amdgpu_bo_reserve(bo, true);

	if (r) {

		amdgpu_bo_unref(&bo);

		return -EINVAL;

	}



	seq_printf(m, "queue_type: %d\n", queue->queue_type);

	seq_printf(m, "mqd_gpu_address: 0x%llx\n", amdgpu_bo_gpu_offset(queue->mqd.obj));



	amdgpu_bo_unreserve(bo);

	amdgpu_bo_unref(&bo);



	return 0;

}



static int amdgpu_mqd_info_open(struct inode *inode, struct file *file)

{

	return single_open(file, amdgpu_mqd_info_read, inode->i_private);

}



static const struct file_operations amdgpu_mqd_info_fops = {

	.owner = THIS_MODULE,

	.open = amdgpu_mqd_info_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

#endif



static int

amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)

{
@@ -885,14 +845,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) 
	}

	up_read(&adev->reset_domain->sem);



#if defined(CONFIG_DEBUG_FS)

	char queue_name[32];



	scnprintf(queue_name, sizeof(queue_name), "queue_%d", qid);

	/* Queue dentry per client to hold MQD information   */

	queue->debugfs_queue = debugfs_create_dir(queue_name, filp->debugfs_client);

	debugfs_create_file("mqd_info", 0444, queue->debugfs_queue, queue, &amdgpu_mqd_info_fops);

#endif

	amdgpu_debugfs_userq_init(filp, queue, qid);

	amdgpu_userq_init_hang_detect_work(queue);



	args->out.queue_id = qid;