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

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

Merge "msm: mdss: disable Client Driven Prefetch"

parents 6875b99e 71780d1d

drivers/video/fbdev/msm/mdss.h

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ struct mdss_data_type { 
	u32 enable_gate;

	u32 enable_bw_release;

	u32 enable_rotator_bw_release;

	u32 enable_cdp;

	u32 serialize_wait4pp;

	u32 wait4autorefresh;

	u32 lines_before_active;

drivers/video/fbdev/msm/mdss_mdp.c

+4 −2
Original line number Diff line number Diff line
@@ -1883,7 +1883,8 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		mdata->pixel_ram_size = 50 * 1024;

		set_bit(MDSS_QOS_PER_PIPE_IB, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_OVERHEAD_FACTOR, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_CDP, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_CDP, mdata->mdss_qos_map); /* cdp supported */

		mdata->enable_cdp = true; /* enable cdp */

		set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_PER_PIPE_LUT, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_SIMPLIFIED_PREFILL, mdata->mdss_qos_map);
@@ -1978,7 +1979,8 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		set_bit(MDSS_QOS_PER_PIPE_IB, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_REMAPPER, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_OVERHEAD_FACTOR, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_CDP, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_CDP, mdata->mdss_qos_map); /* cdp supported */

		mdata->enable_cdp = false; /* disable cdp */

		set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_PER_PIPE_LUT, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_SIMPLIFIED_PREFILL, mdata->mdss_qos_map);

drivers/video/fbdev/msm/mdss_mdp_pipe.c

+3 −2
Original line number Diff line number Diff line
@@ -2066,8 +2066,9 @@ static void mdss_mdp_set_pipe_cdp(struct mdss_mdp_pipe *pipe) 
	u32 cdp_settings = 0x0;

	bool is_rotator = (pipe->mixer_left && pipe->mixer_left->rotator_mode);



	/* Disable CDP for rotator pipe in v1 */

	if (is_rotator && mdss_has_quirk(mdata, MDSS_QUIRK_ROTCDP))

	/* Disable CDP for rotator pipe or if not requested for the target */

	if (!mdata->enable_cdp || (is_rotator &&

			mdss_has_quirk(mdata, MDSS_QUIRK_ROTCDP)))

		goto exit;



	cdp_settings = MDSS_MDP_CDP_ENABLE;