Commit f9c27e64 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/mdp5: migrate SMP dumping to using atomic_print_state 



The Shared Memory Pool (SMP) state is a part of the MDP5's private
object state. Use existing infrastructure, atomic_print_state()
callback, to dump SMP state (which also makes it included into
debugfs/dri/N/state). This allows us to drop the custom debugfs file
too.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/570179/
Link: https://lore.kernel.org/r/20231203000532.1290480-5-dmitry.baryshkov@linaro.org
parent abbf3108

drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ static void mdp5_irq_error_handler(struct mdp_irq *irq, uint32_t irqstatus) 
	if (dumpstate && __ratelimit(&rs)) {

		struct drm_printer p = drm_info_printer(mdp5_kms->dev->dev);

		drm_state_dump(mdp5_kms->dev, &p);

		if (mdp5_kms->smp)

			mdp5_smp_dump(mdp5_kms->smp, &p);

	}

}

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+10 −36
Original line number Diff line number Diff line
@@ -119,9 +119,19 @@ static void mdp5_global_destroy_state(struct drm_private_obj *obj, 
	kfree(mdp5_state);

}



static void mdp5_global_print_state(struct drm_printer *p,

				    const struct drm_private_state *state)

{

	struct mdp5_global_state *mdp5_state = to_mdp5_global_state(state);



	if (mdp5_state->mdp5_kms->smp)

		mdp5_smp_dump(mdp5_state->mdp5_kms->smp, p, mdp5_state);

}



static const struct drm_private_state_funcs mdp5_global_state_funcs = {

	.atomic_duplicate_state = mdp5_global_duplicate_state,

	.atomic_destroy_state = mdp5_global_destroy_state,

	.atomic_print_state = mdp5_global_print_state,

};



static int mdp5_global_obj_init(struct mdp5_kms *mdp5_kms)
@@ -206,39 +216,6 @@ static void mdp5_kms_destroy(struct msm_kms *kms) 
	mdp5_destroy(mdp5_kms);

}



#ifdef CONFIG_DEBUG_FS

static int smp_show(struct seq_file *m, void *arg)

{

	struct drm_info_node *node = m->private;

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

	struct msm_drm_private *priv = dev->dev_private;

	struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms));

	struct drm_printer p = drm_seq_file_printer(m);



	if (!mdp5_kms->smp) {

		drm_printf(&p, "no SMP pool\n");

		return 0;

	}



	mdp5_smp_dump(mdp5_kms->smp, &p);



	return 0;

}



static struct drm_info_list mdp5_debugfs_list[] = {

		{"smp", smp_show },

};



static int mdp5_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)

{

	drm_debugfs_create_files(mdp5_debugfs_list,

				 ARRAY_SIZE(mdp5_debugfs_list),

				 minor->debugfs_root, minor);



	return 0;

}

#endif



static const struct mdp_kms_funcs kms_funcs = {

	.base = {

		.hw_init         = mdp5_hw_init,
@@ -256,9 +233,6 @@ static const struct mdp_kms_funcs kms_funcs = { 
		.complete_commit = mdp5_complete_commit,

		.get_format      = mdp_get_format,

		.destroy         = mdp5_kms_destroy,

#ifdef CONFIG_DEBUG_FS

		.debugfs_init    = mdp5_kms_debugfs_init,

#endif

	},

	.set_irqmask         = mdp5_set_irqmask,

};

drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c

+2 −10
Original line number Diff line number Diff line
@@ -325,22 +325,17 @@ void mdp5_smp_complete_commit(struct mdp5_smp *smp, struct mdp5_smp_state *state 
	state->released = 0;

}



void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p)

void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p,

		   struct mdp5_global_state *global_state)

{

	struct mdp5_kms *mdp5_kms = get_kms(smp);

	struct mdp5_hw_pipe_state *hwpstate;

	struct mdp5_smp_state *state;

	struct mdp5_global_state *global_state;

	int total = 0, i, j;



	drm_printf(p, "name\tinuse\tplane\n");

	drm_printf(p, "----\t-----\t-----\n");



	if (drm_can_sleep())

		drm_modeset_lock(&mdp5_kms->glob_state_lock, NULL);



	global_state = mdp5_get_existing_global_state(mdp5_kms);



	/* grab these *after* we hold the state_lock */

	hwpstate = &global_state->hwpipe;

	state = &global_state->smp;
@@ -365,9 +360,6 @@ void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p) 
	drm_printf(p, "TOTAL:\t%d\t(of %d)\n", total, smp->blk_cnt);

	drm_printf(p, "AVAIL:\t%d\n", smp->blk_cnt -

			bitmap_weight(state->state, smp->blk_cnt));



	if (drm_can_sleep())

		drm_modeset_unlock(&mdp5_kms->glob_state_lock);

}

drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ struct mdp5_smp; 
struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms,

		const struct mdp5_smp_block *cfg);



void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p);

struct mdp5_global_state;

void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p,

		   struct mdp5_global_state *global_state);



uint32_t mdp5_smp_calculate(struct mdp5_smp *smp,

		const struct mdp_format *format,