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

Commit 5aa9ee22 authored by Adrian Salido-Moreno's avatar Adrian Salido-Moreno Committed by Gerrit - the friendly Code Review server
Browse files

msm: mdss: restructure tearcheck config 



Since we have a separate function for tear check enable.
Tearcheck config with enable flag is not required, and
redundant. Remove enable flag and improper usage of
the function.

CRs-fixed: 873962
Change-Id: I0835f858cc63a41e01a669069677322da408f245
Signed-off-by: default avatarAdrian Salido-Moreno <adrianm@codeaurora.org>
parent 65bdd3d2

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+34 −35
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ static int mdss_mdp_tearcheck_enable(struct mdss_mdp_ctl *ctl, bool enable) 


	sctl = mdss_mdp_get_split_ctl(ctl);

	te = &ctl->panel_data->panel_info.te;



	pr_debug("%s: enable=%d\n", __func__, enable);



	mdss_mdp_pingpong_write(mixer->pingpong_base,

		MDSS_MDP_REG_PP_TEAR_CHECK_EN,

		(te ? te->tear_check_en : 0) && enable);
@@ -179,7 +182,7 @@ static int mdss_mdp_tearcheck_enable(struct mdss_mdp_ctl *ctl, bool enable) 
}



static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_mixer *mixer,

		struct mdss_mdp_cmd_ctx *ctx, bool enable)

		struct mdss_mdp_cmd_ctx *ctx)

{

	struct mdss_mdp_pp_tear_check *te = NULL;

	struct mdss_panel_info *pinfo;
@@ -193,7 +196,6 @@ static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_mixer *mixer, 
		return -ENODEV;

	}



	if (enable) {

	pinfo = &ctl->panel_data->panel_info;

	te = &ctl->panel_data->panel_info.te;
@@ -212,10 +214,10 @@ static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_mixer *mixer, 
	if (pinfo->mipi.hw_vsync_mode)

		cfg |= BIT(20);



		if (te->refx100)

	if (te->refx100) {

		vclks_line = vclks_line * pinfo->mipi.frame_rate *

			100 / te->refx100;

		else {

	} else {

		pr_warn("refx100 cannot be zero! Use 6000 as default\n");

		vclks_line = vclks_line * pinfo->mipi.frame_rate *

			100 / 6000;
@@ -228,7 +230,6 @@ static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_mixer *mixer, 
			te->vsync_init_val, te->rd_ptr_irq, te->start_pos);

	pr_debug("thrd_start =%d thrd_cont=%d\n",

		te->sync_threshold_start, te->sync_threshold_continue);

	}



	pingpong_base = mixer->pingpong_base;
@@ -260,8 +261,7 @@ static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_mixer *mixer, 
	return 0;

}



static int mdss_mdp_cmd_tearcheck_setup(struct mdss_mdp_cmd_ctx *ctx,

		bool enable)

static int mdss_mdp_cmd_tearcheck_setup(struct mdss_mdp_cmd_ctx *ctx)

{

	int rc = 0;

	struct mdss_mdp_mixer *mixer;
@@ -270,7 +270,7 @@ static int mdss_mdp_cmd_tearcheck_setup(struct mdss_mdp_cmd_ctx *ctx, 


	mixer = mdss_mdp_mixer_get(ctl, MDSS_MDP_MIXER_MUX_LEFT);

	if (mixer) {

		rc = mdss_mdp_cmd_tearcheck_cfg(mixer, ctx, enable);

		rc = mdss_mdp_cmd_tearcheck_cfg(mixer, ctx);

		if (rc)

			goto err;

	}
@@ -279,7 +279,7 @@ static int mdss_mdp_cmd_tearcheck_setup(struct mdss_mdp_cmd_ctx *ctx, 
	    !is_dsc_compression(pinfo)) {

		mixer = mdss_mdp_mixer_get(ctl, MDSS_MDP_MIXER_MUX_RIGHT);

		if (mixer)

			rc = mdss_mdp_cmd_tearcheck_cfg(mixer, ctx, enable);

			rc = mdss_mdp_cmd_tearcheck_cfg(mixer, ctx);

	}

err:

	return rc;
@@ -1681,7 +1681,7 @@ int mdss_mdp_cmd_restore(struct mdss_mdp_ctl *ctl) 
{

	pr_debug("%s: called for ctl%d\n", __func__, ctl->num);

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);

	if (mdss_mdp_cmd_tearcheck_setup(ctl->intf_ctx[MASTER_CTX], true))

	if (mdss_mdp_cmd_tearcheck_setup(ctl->intf_ctx[MASTER_CTX]))

		pr_warn("%s: tearcheck setup failed\n", __func__);

	else

		mdss_mdp_tearcheck_enable(ctl, true);
@@ -1729,7 +1729,6 @@ int mdss_mdp_cmd_ctx_stop(struct mdss_mdp_ctl *ctl, 
	mdss_mdp_resource_control(ctl, MDP_RSRC_CTL_EVENT_STOP);



	flush_work(&ctx->pp_done_work);

	mdss_mdp_cmd_tearcheck_setup(ctx, false);

	mdss_mdp_tearcheck_enable(ctl, false);



	if (mdss_panel_is_power_on(panel_power_state)) {
@@ -2050,7 +2049,7 @@ static int mdss_mdp_cmd_ctx_setup(struct mdss_mdp_ctl *ctl, 
	mdss_mdp_set_intr_callback(MDSS_MDP_IRQ_PING_PONG_COMP, ctx->pp_num,

				   mdss_mdp_cmd_pingpong_done, ctl);



	ret = mdss_mdp_cmd_tearcheck_setup(ctx, true);

	ret = mdss_mdp_cmd_tearcheck_setup(ctx);

	if (ret)

		pr_err("tearcheck setup failed\n");