Commit 5b54d679 authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/radeon: do not use drm middle layer for debugfs (v2) 



Use debugfs API directly instead of drm middle layer.

v2: squash in build fix (Alex)

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e7fa81bb

drivers/gpu/drm/radeon/r100.c

+31 −53
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/seq_file.h>

#include <linux/slab.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_device.h>

#include <drm/drm_file.h>

#include <drm/drm_fourcc.h>
@@ -1121,9 +1120,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) 
	uint32_t tmp;

	int r;



	if (r100_debugfs_cp_init(rdev)) {

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

	}

	r100_debugfs_cp_init(rdev);

	if (!rdev->me_fw) {

		r = r100_cp_init_microcode(rdev);

		if (r) {
@@ -2920,11 +2917,9 @@ static void r100_set_safe_registers(struct radeon_device *rdev) 
 * Debugfs info

 */

#if defined(CONFIG_DEBUG_FS)

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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;

	uint32_t reg, value;

	unsigned i;
@@ -2941,11 +2936,9 @@ static int r100_debugfs_rbbm_info(struct seq_file *m, void *data) 
	return 0;

}



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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;

	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];

	uint32_t rdp, wdp;

	unsigned count, i, j;
@@ -2969,11 +2962,9 @@ static int r100_debugfs_cp_ring_info(struct seq_file *m, void *data) 
}





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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;

	uint32_t csq_stat, csq2_stat, tmp;

	unsigned r_rptr, r_wptr, ib1_rptr, ib1_wptr, ib2_rptr, ib2_wptr;

	unsigned i;
@@ -3019,11 +3010,9 @@ static int r100_debugfs_cp_csq_fifo(struct seq_file *m, void *data) 
	return 0;

}



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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;

	uint32_t tmp;



	tmp = RREG32(RADEON_CONFIG_MEMSIZE);
@@ -3049,44 +3038,42 @@ static int r100_debugfs_mc_info(struct seq_file *m, void *data) 
	return 0;

}



static struct drm_info_list r100_debugfs_rbbm_list[] = {

	{"r100_rbbm_info", r100_debugfs_rbbm_info, 0, NULL},

};

DEFINE_SHOW_ATTRIBUTE(r100_debugfs_rbbm_info);

DEFINE_SHOW_ATTRIBUTE(r100_debugfs_cp_ring_info);

DEFINE_SHOW_ATTRIBUTE(r100_debugfs_cp_csq_fifo);

DEFINE_SHOW_ATTRIBUTE(r100_debugfs_mc_info);



static struct drm_info_list r100_debugfs_cp_list[] = {

	{"r100_cp_ring_info", r100_debugfs_cp_ring_info, 0, NULL},

	{"r100_cp_csq_fifo", r100_debugfs_cp_csq_fifo, 0, NULL},

};



static struct drm_info_list r100_debugfs_mc_info_list[] = {

	{"r100_mc_info", r100_debugfs_mc_info, 0, NULL},

};

#endif



int r100_debugfs_rbbm_init(struct radeon_device *rdev)

void  r100_debugfs_rbbm_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, r100_debugfs_rbbm_list, 1);

#else

	return 0;

	struct dentry *root = rdev->ddev->primary->debugfs_root;



	debugfs_create_file("r100_rbbm_info", 0444, root, rdev,

			    &r100_debugfs_rbbm_info_fops);

#endif

}



int r100_debugfs_cp_init(struct radeon_device *rdev)

void r100_debugfs_cp_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, r100_debugfs_cp_list, 2);

#else

	return 0;

	struct dentry *root = rdev->ddev->primary->debugfs_root;



	debugfs_create_file("r100_cp_ring_info", 0444, root, rdev,

			    &r100_debugfs_cp_ring_info_fops);

	debugfs_create_file("r100_cp_csq_fifo", 0444, root, rdev,

			    &r100_debugfs_cp_csq_fifo_fops);

#endif

}



int r100_debugfs_mc_info_init(struct radeon_device *rdev)

void  r100_debugfs_mc_info_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, r100_debugfs_mc_info_list, 1);

#else

	return 0;

	struct dentry *root = rdev->ddev->primary->debugfs_root;



	debugfs_create_file("r100_mc_info", 0444, root, rdev,

			    &r100_debugfs_mc_info_fops);

#endif

}
@@ -3834,15 +3821,6 @@ void r100_vga_render_disable(struct radeon_device *rdev) 
	WREG8(R_0003C2_GENMO_WT, C_0003C2_VGA_RAM_EN & tmp);

}



static void r100_debugfs(struct radeon_device *rdev)

{

	int r;



	r = r100_debugfs_mc_info_init(rdev);

	if (r)

		dev_warn(rdev->dev, "Failed to create r100_mc debugfs file.\n");

}



static void r100_mc_program(struct radeon_device *rdev)

{

	struct r100_mc_save save;
@@ -4031,7 +4009,7 @@ int r100_init(struct radeon_device *rdev) 
	int r;



	/* Register debugfs file specific to this group of asics */

	r100_debugfs(rdev);

	r100_debugfs_mc_info_init(rdev);

	/* Disable VGA */

	r100_vga_render_disable(rdev);

	/* Initialize scratch registers */

drivers/gpu/drm/radeon/r300.c

+12 −21
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include <drm/drm.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_debugfs.h>

#include <drm/drm_device.h>

#include <drm/drm_file.h>

#include <drm/radeon_drm.h>
@@ -83,7 +82,7 @@ void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v) 
/*

 * rv370,rv380 PCIE GART

 */

static int rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev);

static void rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev);



void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev)

{
@@ -140,9 +139,8 @@ int rv370_pcie_gart_init(struct radeon_device *rdev) 
	r = radeon_gart_init(rdev);

	if (r)

		return r;

	r = rv370_debugfs_pcie_gart_info_init(rdev);

	if (r)

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

	rv370_debugfs_pcie_gart_info_init(rdev);



	rdev->gart.table_size = rdev->gart.num_gpu_pages * 4;

	rdev->asic->gart.tlb_flush = &rv370_pcie_gart_tlb_flush;

	rdev->asic->gart.get_page_entry = &rv370_pcie_gart_get_page_entry;
@@ -590,11 +588,9 @@ int rv370_get_pcie_lanes(struct radeon_device *rdev) 
}



#if defined(CONFIG_DEBUG_FS)

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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;

	uint32_t tmp;



	tmp = RREG32_PCIE(RADEON_PCIE_TX_GART_CNTL);
@@ -614,17 +610,16 @@ static int rv370_debugfs_pcie_gart_info(struct seq_file *m, void *data) 
	return 0;

}



static struct drm_info_list rv370_pcie_gart_info_list[] = {

	{"rv370_pcie_gart_info", rv370_debugfs_pcie_gart_info, 0, NULL},

};

DEFINE_SHOW_ATTRIBUTE(rv370_debugfs_pcie_gart_info);

#endif



static int rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev)

static void rv370_debugfs_pcie_gart_info_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, rv370_pcie_gart_info_list, 1);

#else

	return 0;

	struct dentry *root = rdev->ddev->primary->debugfs_root;



	debugfs_create_file("rv370_pcie_gart_info", 0444, root, rdev,

			    &rv370_debugfs_pcie_gart_info_fops);

#endif

}
@@ -1331,12 +1326,8 @@ void r300_set_reg_safe(struct radeon_device *rdev) 
void r300_mc_program(struct radeon_device *rdev)

{

	struct r100_mc_save save;

	int r;



	r = r100_debugfs_mc_info_init(rdev);

	if (r) {

		dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");

	}

	r100_debugfs_mc_info_init(rdev);



	/* Stops all mc clients */

	r100_mc_stop(rdev, &save);

drivers/gpu/drm/radeon/r420.c

+10 −18
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/seq_file.h>

#include <linux/slab.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_device.h>

#include <drm/drm_file.h>
@@ -187,12 +186,8 @@ void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v) 


static void r420_debugfs(struct radeon_device *rdev)

{

	if (r100_debugfs_rbbm_init(rdev)) {

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

	}

	if (r420_debugfs_pipes_info_init(rdev)) {

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

	}

	r100_debugfs_rbbm_init(rdev);

	r420_debugfs_pipes_info_init(rdev);

}



static void r420_clock_resume(struct radeon_device *rdev)
@@ -480,11 +475,9 @@ int r420_init(struct radeon_device *rdev) 
 * Debugfs info

 */

#if defined(CONFIG_DEBUG_FS)

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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;

	uint32_t tmp;



	tmp = RREG32(R400_GB_PIPE_SELECT);
@@ -496,16 +489,15 @@ static int r420_debugfs_pipes_info(struct seq_file *m, void *data) 
	return 0;

}



static struct drm_info_list r420_pipes_info_list[] = {

	{"r420_pipes_info", r420_debugfs_pipes_info, 0, NULL},

};

DEFINE_SHOW_ATTRIBUTE(r420_debugfs_pipes_info);

#endif



int r420_debugfs_pipes_info_init(struct radeon_device *rdev)

void r420_debugfs_pipes_info_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, r420_pipes_info_list, 1);

#else

	return 0;

	struct dentry *root = rdev->ddev->primary->debugfs_root;



	debugfs_create_file("r420_pipes_info", 0444, root, rdev,

			    &r420_debugfs_pipes_info_fops);

#endif

}

drivers/gpu/drm/radeon/r600.c

+11 −16
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/slab.h>

#include <linux/seq_file.h>



#include <drm/drm_debugfs.h>

#include <drm/drm_device.h>

#include <drm/drm_vblank.h>

#include <drm/radeon_drm.h>
@@ -106,7 +105,7 @@ static const u32 crtc_offsets[2] = 
	AVIVO_D2CRTC_H_TOTAL - AVIVO_D1CRTC_H_TOTAL

};



int r600_debugfs_mc_info_init(struct radeon_device *rdev);

static void r600_debugfs_mc_info_init(struct radeon_device *rdev);



/* r600,rv610,rv630,rv620,rv635,rv670 */

int r600_mc_wait_for_idle(struct radeon_device *rdev);
@@ -3251,9 +3250,7 @@ int r600_init(struct radeon_device *rdev) 
{

	int r;



	if (r600_debugfs_mc_info_init(rdev)) {

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

	}

	r600_debugfs_mc_info_init(rdev);

	/* Read BIOS */

	if (!radeon_get_bios(rdev)) {

		if (ASIC_IS_AVIVO(rdev))
@@ -4346,28 +4343,26 @@ int r600_irq_process(struct radeon_device *rdev) 
 */

#if defined(CONFIG_DEBUG_FS)



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

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

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = (struct radeon_device *)m->private;



	DREG32_SYS(m, rdev, R_000E50_SRBM_STATUS);

	DREG32_SYS(m, rdev, VM_L2_STATUS);

	return 0;

}



static struct drm_info_list r600_mc_info_list[] = {

	{"r600_mc_info", r600_debugfs_mc_info, 0, NULL},

};

DEFINE_SHOW_ATTRIBUTE(r600_debugfs_mc_info);

#endif



int r600_debugfs_mc_info_init(struct radeon_device *rdev)

static void r600_debugfs_mc_info_init(struct radeon_device *rdev)

{

#if defined(CONFIG_DEBUG_FS)

	return radeon_debugfs_add_files(rdev, r600_mc_info_list, ARRAY_SIZE(r600_mc_info_list));

#else

	return 0;

	struct dentry *root = rdev->ddev->primary->debugfs_root;



	debugfs_create_file("r600_mc_info", 0444, root, rdev,

			    &r600_debugfs_mc_info_fops);



#endif

}

drivers/gpu/drm/radeon/radeon.h

+2 −14
Original line number Diff line number Diff line
@@ -511,8 +511,6 @@ struct radeon_bo { 
};

#define gem_to_radeon_bo(gobj) container_of((gobj), struct radeon_bo, tbo.base)



int radeon_gem_debugfs_init(struct radeon_device *rdev);



/* sub-allocation manager, it has to be protected by another lock.

 * By conception this is an helper for other part of the driver

 * like the indirect buffer or semaphore, which both have their
@@ -1789,15 +1787,8 @@ static inline void radeon_mn_unregister(struct radeon_bo *bo) {} 
/*

 * Debugfs

 */

struct radeon_debugfs {

	struct drm_info_list	*files;

	unsigned		num_files;

};



int radeon_debugfs_add_files(struct radeon_device *rdev,

			     struct drm_info_list *files,

			     unsigned nfiles);

int radeon_debugfs_fence_init(struct radeon_device *rdev);

void radeon_debugfs_fence_init(struct radeon_device *rdev);

void radeon_gem_debugfs_init(struct radeon_device *rdev);



/*

 * ASIC ring specific functions.
@@ -2422,9 +2413,6 @@ struct radeon_device { 
	struct drm_file *cmask_filp;

	/* i2c buses */

	struct radeon_i2c_chan *i2c_bus[RADEON_MAX_I2C_BUS];

	/* debugfs */

	struct radeon_debugfs	debugfs[RADEON_DEBUGFS_MAX_COMPONENTS];

	unsigned 		debugfs_count;

	/* virtual memory */

	struct radeon_vm_manager	vm_manager;

	struct mutex			gpu_clock_mutex;