Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e2d5150 authored by Ingrid Gallardo's avatar Ingrid Gallardo
Browse files

drm/msm/sde: remove unnecessary debugfs from plane 



Remove unnecessary debugfs nodes from the planes.

Change-Id: Ib38894f41b3695b1f851d53364e8ed15559ed517
Signed-off-by: default avatarIngrid Gallardo <ingridg@codeaurora.org>
parent ca86eb4c

drivers/gpu/drm/msm/sde/sde_kms.c

+0 −23
Original line number Diff line number Diff line
@@ -271,29 +271,6 @@ static const struct file_operations sde_fops_regset32 = { 
	.release =	single_release,

};



void sde_debugfs_setup_regset32(struct sde_debugfs_regset32 *regset,

		uint32_t offset, uint32_t length, struct sde_kms *sde_kms)

{

	if (regset) {

		regset->offset = offset;

		regset->blk_len = length;

		regset->sde_kms = sde_kms;

	}

}



void *sde_debugfs_create_regset32(const char *name, umode_t mode,

		void *parent, struct sde_debugfs_regset32 *regset)

{

	if (!name || !regset || !regset->sde_kms || !regset->blk_len)

		return NULL;



	/* make sure offset is a multiple of 4 */

	regset->offset = round_down(regset->offset, 4);



	return debugfs_create_file(name, mode, parent,

			regset, &sde_fops_regset32);

}



void *sde_debugfs_get_root(struct sde_kms *sde_kms)

{

	struct msm_drm_private *priv;

drivers/gpu/drm/msm/sde/sde_kms.h

+0 −39
Original line number Diff line number Diff line
@@ -423,45 +423,6 @@ struct sde_debugfs_regset32 { 
	struct sde_kms *sde_kms;

};



/**

 * sde_debugfs_setup_regset32 - Initialize register block definition for debugfs

 * This function is meant to initialize sde_debugfs_regset32 structures for use

 * with sde_debugfs_create_regset32.

 * @regset: opaque register definition structure

 * @offset: sub-block offset

 * @length: sub-block length, in bytes

 * @sde_kms: pointer to sde kms structure

 */

void sde_debugfs_setup_regset32(struct sde_debugfs_regset32 *regset,

		uint32_t offset, uint32_t length, struct sde_kms *sde_kms);



/**

 * sde_debugfs_create_regset32 - Create register read back file for debugfs

 *

 * This function is almost identical to the standard debugfs_create_regset32()

 * function, with the main difference being that a list of register

 * names/offsets do not need to be provided. The 'read' function simply outputs

 * sequential register values over a specified range.

 *

 * Similar to the related debugfs_create_regset32 API, the structure pointed to

 * by regset needs to persist for the lifetime of the created file. The calling

 * code is responsible for initialization/management of this structure.

 *

 * The structure pointed to by regset is meant to be opaque. Please use

 * sde_debugfs_setup_regset32 to initialize it.

 *

 * @name:   File name within debugfs

 * @mode:   File mode within debugfs

 * @parent: Parent directory entry within debugfs, can be NULL

 * @regset: Pointer to persistent register block definition

 *

 * Return: dentry pointer for newly created file, use either debugfs_remove()

 *         or debugfs_remove_recursive() (on a parent directory) to remove the

 *         file

 */

void *sde_debugfs_create_regset32(const char *name, umode_t mode,

		void *parent, struct sde_debugfs_regset32 *regset);



/**

 * sde_debugfs_get_root - Return root directory entry for KMS's debugfs

 *

drivers/gpu/drm/msm/sde/sde_plane.c

+1 −27
Original line number Diff line number Diff line
@@ -3934,39 +3934,13 @@ static int _sde_plane_init_debugfs(struct drm_plane *plane) 
	debugfs_create_x32("features", 0600,

			psde->debugfs_root, &psde->features);



	/* add register dump support */

	sde_debugfs_setup_regset32(&psde->debugfs_src,

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

			sblk->src_blk.len,

			kms);

	sde_debugfs_create_regset32("src_blk", 0400,

			psde->debugfs_root, &psde->debugfs_src);



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

			cfg->features & BIT(SDE_SSPP_SCALER_QSEED3LITE) ||

			cfg->features & BIT(SDE_SSPP_SCALER_QSEED2)) {

		sde_debugfs_setup_regset32(&psde->debugfs_scaler,

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

				sblk->scaler_blk.len,

				kms);

		sde_debugfs_create_regset32("scaler_blk", 0400,

				psde->debugfs_root,

				&psde->debugfs_scaler);

			cfg->features & BIT(SDE_SSPP_SCALER_QSEED2))

		debugfs_create_bool("default_scaling",

				0600,

				psde->debugfs_root,

				&psde->debugfs_default_scale);

	}



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

			cfg->features & BIT(SDE_SSPP_CSC_10BIT)) {

		sde_debugfs_setup_regset32(&psde->debugfs_csc,

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

				sblk->csc_blk.len,

				kms);

		sde_debugfs_create_regset32("csc_blk", 0400,

				psde->debugfs_root, &psde->debugfs_csc);

	}



	debugfs_create_u32("xin_id",

			0400,