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

Commit fbe1061e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: require root permission for sde debugfs entries"

parents 2126d7a6 8de415a8

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

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static int sde_connector_init_debugfs(struct drm_connector *connector) 


	sde_connector = to_sde_connector(connector);



	if (!debugfs_create_bool("fb_kmap", 0644, connector->debugfs_entry,

	if (!debugfs_create_bool("fb_kmap", 0600, connector->debugfs_entry,

			&sde_connector->fb_kmap)) {

		SDE_ERROR("failed to create connector fb_kmap\n");

		return -ENOMEM;

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

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ DEFINE_SDE_DEBUGFS_SEQ_FOPS(sde_debugfs_core_irq); 
int sde_debugfs_core_irq_init(struct sde_kms *sde_kms,

		struct dentry *parent)

{

	sde_kms->irq_obj.debugfs_file = debugfs_create_file("core_irq", 0644,

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

			parent, &sde_kms->irq_obj,

			&sde_debugfs_core_irq_fops);

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

+9 −9
Original line number Diff line number Diff line
@@ -634,27 +634,27 @@ int sde_core_perf_debugfs_init(struct sde_core_perf *perf, 
		return -EINVAL;

	}



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

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

			&perf->max_core_clk_rate);

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

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

			&perf->core_clk_rate);

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

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

			(u32 *)&perf->enable_bw_release);

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

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

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

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

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

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

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

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

			(u32 *)perf, &sde_core_perf_mode_fops);

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

			&perf->bw_vote_mode);

	debugfs_create_bool("bw_vote_mode_updated", 0600, perf->debugfs_root,

			&perf->bw_vote_mode_updated);

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

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

			&perf->fix_core_clk_rate);

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

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

			&perf->fix_core_ib_vote);

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

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

			&perf->fix_core_ab_vote);



	return 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -3503,14 +3503,14 @@ static int _sde_crtc_init_debugfs(struct drm_crtc *crtc) 
		return -ENOMEM;



	/* don't error check these */

	debugfs_create_file("status", 0444,

	debugfs_create_file("status", 0400,

			sde_crtc->debugfs_root,

			sde_crtc, &debugfs_status_fops);

	debugfs_create_file("state", 0644,

	debugfs_create_file("state", 0600,

			sde_crtc->debugfs_root,

			&sde_crtc->base,

			&sde_crtc_debugfs_state_fops);

	debugfs_create_file("misr_data", 0644, sde_crtc->debugfs_root,

	debugfs_create_file("misr_data", 0600, sde_crtc->debugfs_root,

					sde_crtc, &debugfs_misr_fops);



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -2445,10 +2445,10 @@ static int _sde_encoder_init_debugfs(struct drm_encoder *drm_enc) 
		return -ENOMEM;



	/* don't error check these */

	debugfs_create_file("status", 0644,

	debugfs_create_file("status", 0600,

		sde_enc->debugfs_root, sde_enc, &debugfs_status_fops);



	debugfs_create_file("misr_data", 0644,

	debugfs_create_file("misr_data", 0600,

		sde_enc->debugfs_root, sde_enc, &debugfs_misr_fops);



	for (i = 0; i < sde_enc->num_phys_encs; i++)