Commit 3d688410 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/dpu: Cleanup the debugfs functions 



Do some debugfs cleanups from across the DPU driver. The DRM
destroy functions will do a recursive delete on the entire
debugfs node so there is no need to store dentry pointers for
the debugfs files that are persistent for the life of the
driver. This also means that the destroy functions can go
away too.

Also, use standard API functions where applicable instead of
using hand written code.

v3: No changes
v2: Add more code; most of the dpu debugfs files should be
addressed now.

Reviewed-by: default avatarSean Paul <sean@poorly.run>
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 8fe62a63

drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c

+4 −26
Original line number Diff line number Diff line
@@ -319,10 +319,8 @@ static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v) 
	unsigned long irq_flags;

	int i, irq_count, enable_count, cb_count;



	if (!irq_obj || !irq_obj->enable_counts || !irq_obj->irq_cb_tbl) {

		DPU_ERROR("invalid parameters\n");

	if (WARN_ON(!irq_obj->enable_counts || !irq_obj->irq_cb_tbl))

		return 0;

	}



	for (i = 0; i < irq_obj->total_irqs; i++) {

		spin_lock_irqsave(&irq_obj->cb_lock, irq_flags);
@@ -343,31 +341,11 @@ static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v) 


DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_core_irq);



int dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,

void dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,

		struct dentry *parent)

{

	dpu_kms->irq_obj.debugfs_file = debugfs_create_file("core_irq", 0600,

			parent, &dpu_kms->irq_obj,

	debugfs_create_file("core_irq", 0600, parent, &dpu_kms->irq_obj,

		&dpu_debugfs_core_irq_fops);



	return 0;

}



void dpu_debugfs_core_irq_destroy(struct dpu_kms *dpu_kms)

{

	debugfs_remove(dpu_kms->irq_obj.debugfs_file);

	dpu_kms->irq_obj.debugfs_file = NULL;

}



#else

int dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,

		struct dentry *parent)

{

	return 0;

}



void dpu_debugfs_core_irq_destroy(struct dpu_kms *dpu_kms)

{

}

#endif

drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

+1 −8
Original line number Diff line number Diff line
@@ -132,15 +132,8 @@ int dpu_core_irq_unregister_callback( 
 * dpu_debugfs_core_irq_init - register core irq debugfs

 * @dpu_kms: pointer to kms

 * @parent: debugfs directory root

 * @Return: 0 on success

 */

int dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,

void dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,

		struct dentry *parent);



/**

 * dpu_debugfs_core_irq_destroy - deregister core irq debugfs

 * @dpu_kms: pointer to kms

 */

void dpu_debugfs_core_irq_destroy(struct dpu_kms *dpu_kms);



#endif /* __DPU_CORE_IRQ_H__ */

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c

+26 −79
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include "dpu_crtc.h"

#include "dpu_core_perf.h"



#define DPU_PERF_MODE_STRING_SIZE	128



/**

 * enum dpu_perf_mode - performance tuning mode

 * @DPU_PERF_MODE_NORMAL: performance controlled by user mode client
@@ -451,24 +449,14 @@ static ssize_t _dpu_core_perf_mode_write(struct file *file, 
	struct dpu_core_perf *perf = file->private_data;

	struct dpu_perf_cfg *cfg = &perf->catalog->perf;

	u32 perf_mode = 0;

	char buf[10];



	if (!perf)

		return -ENODEV;



	if (count >= sizeof(buf))

		return -EFAULT;



	if (copy_from_user(buf, user_buf, count))

		return -EFAULT;



	buf[count] = 0;	/* end of string */

	int ret;



	if (kstrtouint(buf, 0, &perf_mode))

		return -EFAULT;

	ret = kstrtouint_from_user(user_buf, count, 0, &perf_mode);

	if (ret)

		return ret;



	if (perf_mode >= DPU_PERF_MODE_MAX)

		return -EFAULT;

		return -EINVAL;



	if (perf_mode == DPU_PERF_MODE_FIXED) {

		DRM_INFO("fix performance mode\n");
@@ -493,29 +481,16 @@ static ssize_t _dpu_core_perf_mode_read(struct file *file, 
			char __user *buff, size_t count, loff_t *ppos)

{

	struct dpu_core_perf *perf = file->private_data;

	int len = 0;

	char buf[DPU_PERF_MODE_STRING_SIZE] = {'\0'};

	int len;

	char buf[128];



	if (!perf)

		return -ENODEV;



	if (*ppos)

		return 0;	/* the end */



	len = snprintf(buf, sizeof(buf),

	len = scnprintf(buf, sizeof(buf),

			"mode %d min_mdp_clk %llu min_bus_vote %llu\n",

			perf->perf_tune.mode,

			perf->perf_tune.min_core_clk,

			perf->perf_tune.min_bus_vote);

	if (len < 0 || len >= sizeof(buf))

		return 0;



	if ((count < sizeof(buf)) || copy_to_user(buff, buf, len))

		return -EFAULT;



	*ppos += len;   /* increase offset */



	return len;

	return simple_read_from_buffer(buff, count, ppos, buf, len);

}



static const struct file_operations dpu_core_perf_mode_fops = {
@@ -524,70 +499,43 @@ static const struct file_operations dpu_core_perf_mode_fops = { 
	.write = _dpu_core_perf_mode_write,

};



static void dpu_core_perf_debugfs_destroy(struct dpu_core_perf *perf)

{

	debugfs_remove_recursive(perf->debugfs_root);

	perf->debugfs_root = NULL;

}



int dpu_core_perf_debugfs_init(struct dpu_core_perf *perf,

		struct dentry *parent)

int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent)

{

	struct dpu_core_perf *perf = &dpu_kms->perf;

	struct dpu_mdss_cfg *catalog = perf->catalog;

	struct msm_drm_private *priv;

	struct dpu_kms *dpu_kms;



	priv = perf->dev->dev_private;

	if (!priv || !priv->kms) {

		DPU_ERROR("invalid KMS reference\n");

		return -EINVAL;

	}



	dpu_kms = to_dpu_kms(priv->kms);

	struct dentry *entry;



	perf->debugfs_root = debugfs_create_dir("core_perf", parent);

	if (!perf->debugfs_root) {

		DPU_ERROR("failed to create core perf debugfs\n");

	entry = debugfs_create_dir("core_perf", parent);

	if (IS_ERR_OR_NULL(entry))

		return -EINVAL;

	}



	debugfs_create_u64("max_core_clk_rate", 0600, perf->debugfs_root,

	debugfs_create_u64("max_core_clk_rate", 0600, entry,

			&perf->max_core_clk_rate);

	debugfs_create_u64("core_clk_rate", 0600, perf->debugfs_root,

	debugfs_create_u64("core_clk_rate", 0600, entry,

			&perf->core_clk_rate);

	debugfs_create_u32("enable_bw_release", 0600, perf->debugfs_root,

	debugfs_create_u32("enable_bw_release", 0600, entry,

			(u32 *)&perf->enable_bw_release);

	debugfs_create_u32("threshold_low", 0600, perf->debugfs_root,

	debugfs_create_u32("threshold_low", 0600, entry,

			(u32 *)&catalog->perf.max_bw_low);

	debugfs_create_u32("threshold_high", 0600, perf->debugfs_root,

	debugfs_create_u32("threshold_high", 0600, entry,

			(u32 *)&catalog->perf.max_bw_high);

	debugfs_create_u32("min_core_ib", 0600, perf->debugfs_root,

	debugfs_create_u32("min_core_ib", 0600, entry,

			(u32 *)&catalog->perf.min_core_ib);

	debugfs_create_u32("min_llcc_ib", 0600, perf->debugfs_root,

	debugfs_create_u32("min_llcc_ib", 0600, entry,

			(u32 *)&catalog->perf.min_llcc_ib);

	debugfs_create_u32("min_dram_ib", 0600, perf->debugfs_root,

	debugfs_create_u32("min_dram_ib", 0600, entry,

			(u32 *)&catalog->perf.min_dram_ib);

	debugfs_create_file("perf_mode", 0600, perf->debugfs_root,

	debugfs_create_file("perf_mode", 0600, entry,

			(u32 *)perf, &dpu_core_perf_mode_fops);

	debugfs_create_u64("fix_core_clk_rate", 0600, perf->debugfs_root,

	debugfs_create_u64("fix_core_clk_rate", 0600, entry,

			&perf->fix_core_clk_rate);

	debugfs_create_u64("fix_core_ib_vote", 0600, perf->debugfs_root,

	debugfs_create_u64("fix_core_ib_vote", 0600, entry,

			&perf->fix_core_ib_vote);

	debugfs_create_u64("fix_core_ab_vote", 0600, perf->debugfs_root,

	debugfs_create_u64("fix_core_ab_vote", 0600, entry,

			&perf->fix_core_ab_vote);



	return 0;

}

#else

static void dpu_core_perf_debugfs_destroy(struct dpu_core_perf *perf)

{

}



int dpu_core_perf_debugfs_init(struct dpu_core_perf *perf,

		struct dentry *parent)

{

	return 0;

}

#endif



void dpu_core_perf_destroy(struct dpu_core_perf *perf)
@@ -597,7 +545,6 @@ void dpu_core_perf_destroy(struct dpu_core_perf *perf) 
		return;

	}



	dpu_core_perf_debugfs_destroy(perf);

	perf->max_core_clk_rate = 0;

	perf->core_clk = NULL;

	perf->catalog = NULL;

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h

+4 −3
Original line number Diff line number Diff line
@@ -130,12 +130,13 @@ int dpu_core_perf_init(struct dpu_core_perf *perf, 
		struct dpu_mdss_cfg *catalog,

		struct dss_clk *core_clk);



struct dpu_kms;



/**

 * dpu_core_perf_debugfs_init - initialize debugfs for core performance context

 * @perf: Pointer to core performance context

 * @dpu_kms: Pointer to the dpu_kms struct

 * @debugfs_parent: Pointer to parent debugfs

 */

int dpu_core_perf_debugfs_init(struct dpu_core_perf *perf,

		struct dentry *parent);

int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent);



#endif /* _DPU_CORE_PERF_H_ */

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

+4 −26
Original line number Diff line number Diff line
@@ -1186,9 +1186,6 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) 


	int i, out_width;



	if (!s || !s->private)

		return -EINVAL;



	dpu_crtc = s->private;

	crtc = &dpu_crtc->base;
@@ -1328,8 +1325,7 @@ DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_crtc_debugfs_state); 


static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)

{

	struct dpu_crtc *dpu_crtc;

	struct dpu_kms *dpu_kms;

	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);



	static const struct file_operations debugfs_status_fops = {

		.open =		_dpu_debugfs_status_open,
@@ -1338,12 +1334,6 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc) 
		.release =	single_release,

	};



	if (!crtc)

		return -EINVAL;

	dpu_crtc = to_dpu_crtc(crtc);



	dpu_kms = _dpu_crtc_get_kms(crtc);



	dpu_crtc->debugfs_root = debugfs_create_dir(dpu_crtc->name,

			crtc->dev->primary->debugfs_root);

	if (!dpu_crtc->debugfs_root)
@@ -1360,25 +1350,11 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc) 


	return 0;

}



static void _dpu_crtc_destroy_debugfs(struct drm_crtc *crtc)

{

	struct dpu_crtc *dpu_crtc;



	if (!crtc)

		return;

	dpu_crtc = to_dpu_crtc(crtc);

	debugfs_remove_recursive(dpu_crtc->debugfs_root);

}

#else

static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)

{

	return 0;

}



static void _dpu_crtc_destroy_debugfs(struct drm_crtc *crtc)

{

}

#endif /* CONFIG_DEBUG_FS */



static int dpu_crtc_late_register(struct drm_crtc *crtc)
@@ -1388,7 +1364,9 @@ static int dpu_crtc_late_register(struct drm_crtc *crtc) 


static void dpu_crtc_early_unregister(struct drm_crtc *crtc)

{

	_dpu_crtc_destroy_debugfs(crtc);

	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);



	debugfs_remove_recursive(dpu_crtc->debugfs_root);

}



static const struct drm_crtc_funcs dpu_crtc_funcs = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE