Commit 2672e4e7 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm/dpu: move SSPP debugfs support from plane to SSPP code 



We are preparing to change DPU plane implementation. Move SSPP debugfs
code from dpu_plane.c to dpu_hw_sspp.c, where it belongs.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://lore.kernel.org/r/20211201222633.2476780-9-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 7620bdfb

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

+67 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include "dpu_hw_sspp.h"

#include "dpu_kms.h"



#include <drm/drm_file.h>



#define DPU_FETCH_CONFIG_RESET_VALUE   0x00000087



/* DPU_SSPP_SRC */
@@ -692,6 +694,71 @@ static void _setup_layer_ops(struct dpu_hw_pipe *c, 
		c->ops.setup_cdp = dpu_hw_sspp_setup_cdp;

}



#ifdef CONFIG_DEBUG_FS

int _dpu_hw_sspp_init_debugfs(struct dpu_hw_pipe *hw_pipe, struct dpu_kms *kms, struct dentry *entry)

{

	const struct dpu_sspp_cfg *cfg = hw_pipe->cap;

	const struct dpu_sspp_sub_blks *sblk = cfg->sblk;

	struct dentry *debugfs_root;

	char sspp_name[32];



	snprintf(sspp_name, sizeof(sspp_name), "%d", hw_pipe->idx);



	/* create overall sub-directory for the pipe */

	debugfs_root =

		debugfs_create_dir(sspp_name, entry);



	/* don't error check these */

	debugfs_create_xul("features", 0600,

			debugfs_root, (unsigned long *)&hw_pipe->cap->features);



	/* add register dump support */

	dpu_debugfs_create_regset32("src_blk", 0400,

			debugfs_root,

			sblk->src_blk.base + cfg->base,

			sblk->src_blk.len,

			kms);



	if (cfg->features & BIT(DPU_SSPP_SCALER_QSEED3) ||

			cfg->features & BIT(DPU_SSPP_SCALER_QSEED3LITE) ||

			cfg->features & BIT(DPU_SSPP_SCALER_QSEED2) ||

			cfg->features & BIT(DPU_SSPP_SCALER_QSEED4))

		dpu_debugfs_create_regset32("scaler_blk", 0400,

				debugfs_root,

				sblk->scaler_blk.base + cfg->base,

				sblk->scaler_blk.len,

				kms);



	if (cfg->features & BIT(DPU_SSPP_CSC) ||

			cfg->features & BIT(DPU_SSPP_CSC_10BIT))

		dpu_debugfs_create_regset32("csc_blk", 0400,

				debugfs_root,

				sblk->csc_blk.base + cfg->base,

				sblk->csc_blk.len,

				kms);



	debugfs_create_u32("xin_id",

			0400,

			debugfs_root,

			(u32 *) &cfg->xin_id);

	debugfs_create_u32("clk_ctrl",

			0400,

			debugfs_root,

			(u32 *) &cfg->clk_ctrl);

	debugfs_create_x32("creq_vblank",

			0600,

			debugfs_root,

			(u32 *) &sblk->creq_vblank);

	debugfs_create_x32("danger_vblank",

			0600,

			debugfs_root,

			(u32 *) &sblk->danger_vblank);



	return 0;

}

#endif





static const struct dpu_sspp_cfg *_sspp_offset(enum dpu_sspp sspp,

		void __iomem *addr,

		struct dpu_mdss_cfg *catalog,

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

+4 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ struct dpu_hw_pipe { 
	struct dpu_hw_sspp_ops ops;

};



struct dpu_kms;

/**

 * dpu_hw_sspp_init - initializes the sspp hw driver object.

 * Should be called once before accessing every pipe.
@@ -406,5 +407,8 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, 
 */

void dpu_hw_sspp_destroy(struct dpu_hw_pipe *ctx);



void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root);

int _dpu_hw_sspp_init_debugfs(struct dpu_hw_pipe *hw_pipe, struct dpu_kms *kms, struct dentry *entry);



#endif /*_DPU_HW_SSPP_H */

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

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor) 
	dpu_debugfs_danger_init(dpu_kms, entry);

	dpu_debugfs_vbif_init(dpu_kms, entry);

	dpu_debugfs_core_irq_init(dpu_kms, entry);

	dpu_debugfs_sspp_init(dpu_kms, entry);



	for (i = 0; i < ARRAY_SIZE(priv->dp); i++) {

		if (priv->dp[i])

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

+12 −70
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <drm/drm_atomic.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_damage_helper.h>

#include <drm/drm_file.h>

#include <drm/drm_gem_atomic_helper.h>



#include "msm_drv.h"
@@ -1388,79 +1387,23 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable) 
	pm_runtime_put_sync(&dpu_kms->pdev->dev);

}



static int _dpu_plane_init_debugfs(struct drm_plane *plane)

/* SSPP live inside dpu_plane private data only. Enumerate them here. */

void dpu_debugfs_sspp_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root)

{

	struct drm_plane *plane;

	struct dentry *entry = debugfs_create_dir("sspp", debugfs_root);



	if (IS_ERR(entry))

		return;



	drm_for_each_plane(plane, dpu_kms->dev) {

		struct dpu_plane *pdpu = to_dpu_plane(plane);

	struct dpu_kms *kms = _dpu_plane_get_kms(plane);

	const struct dpu_sspp_cfg *cfg = pdpu->pipe_hw->cap;

	const struct dpu_sspp_sub_blks *sblk = cfg->sblk;

	struct dentry *debugfs_root;



	/* create overall sub-directory for the pipe */

	debugfs_root =

		debugfs_create_dir(plane->name,

				plane->dev->primary->debugfs_root);



	/* don't error check these */

	debugfs_create_xul("features", 0600,

			debugfs_root, (unsigned long *)&pdpu->pipe_hw->cap->features);



	/* add register dump support */

	dpu_debugfs_create_regset32("src_blk", 0400,

			debugfs_root,

			sblk->src_blk.base + cfg->base,

			sblk->src_blk.len,

			kms);



	if (cfg->features & BIT(DPU_SSPP_SCALER_QSEED3) ||

			cfg->features & BIT(DPU_SSPP_SCALER_QSEED3LITE) ||

			cfg->features & BIT(DPU_SSPP_SCALER_QSEED2) ||

			cfg->features & BIT(DPU_SSPP_SCALER_QSEED4))

		dpu_debugfs_create_regset32("scaler_blk", 0400,

				debugfs_root,

				sblk->scaler_blk.base + cfg->base,

				sblk->scaler_blk.len,

				kms);



	if (cfg->features & BIT(DPU_SSPP_CSC) ||

			cfg->features & BIT(DPU_SSPP_CSC_10BIT))

		dpu_debugfs_create_regset32("csc_blk", 0400,

				debugfs_root,

				sblk->csc_blk.base + cfg->base,

				sblk->csc_blk.len,

				kms);



	debugfs_create_u32("xin_id",

			0400,

			debugfs_root,

			(u32 *) &cfg->xin_id);

	debugfs_create_u32("clk_ctrl",

			0400,

			debugfs_root,

			(u32 *) &cfg->clk_ctrl);

	debugfs_create_x32("creq_vblank",

			0600,

			debugfs_root,

			(u32 *) &sblk->creq_vblank);

	debugfs_create_x32("danger_vblank",

			0600,

			debugfs_root,

			(u32 *) &sblk->danger_vblank);



	return 0;

		_dpu_hw_sspp_init_debugfs(pdpu->pipe_hw, dpu_kms, entry);

	}

#else

static int _dpu_plane_init_debugfs(struct drm_plane *plane)

{

	return 0;

}

#endif



static int dpu_plane_late_register(struct drm_plane *plane)

{

	return _dpu_plane_init_debugfs(plane);

}



static bool dpu_plane_format_mod_supported(struct drm_plane *plane,

		uint32_t format, uint64_t modifier)

{
@@ -1486,7 +1429,6 @@ static const struct drm_plane_funcs dpu_plane_funcs = { 
		.atomic_duplicate_state = dpu_plane_duplicate_state,

		.atomic_destroy_state = dpu_plane_destroy_state,

		.atomic_print_state = dpu_plane_atomic_print_state,

		.late_register = dpu_plane_late_register,

		.format_mod_supported = dpu_plane_format_mod_supported,

};