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

Commit cd167375 authored by Clarence Ip's avatar Clarence Ip
Browse files

msm: sde: use min bus vote during init 



Enable minimum bus voting during rotator initialization.
This is needed to allow the correct underlying hardware
driver and features to be selected.

CRs-Fixed: 2040984
Change-Id: If2fa5c10a028227941893d0efedc8b53c4145464
Signed-off-by: default avatarClarence Ip <cip@codeaurora.org>
parent 49903531

drivers/media/platform/msm/sde/rotator/sde_rotator_base.h

+0 −2
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ enum sde_rot_type { 
 * @SDE_CAPS_R1_WB: MDSS V1.x WB block

 * @SDE_CAPS_R3_WB: MDSS V3.x WB block

 * @SDE_CAPS_R3_1P5_DOWNSCALE: 1.5x downscale rotator support

 * @SDE_CAPS_MIN_BUS_VOTE: minimum bus vote prior to power enable

 * @SDE_CAPS_SBUF_1: stream buffer support for inline rotation

 * @SDE_CAPS_UBWC_2: universal bandwidth compression version 2

 */
@@ -105,7 +104,6 @@ enum sde_caps_settings { 
	SDE_CAPS_R3_WB,

	SDE_CAPS_R3_1P5_DOWNSCALE,

	SDE_CAPS_SEC_ATTACH_DETACH_SMMU,

	SDE_CAPS_MIN_BUS_VOTE,

	SDE_CAPS_SBUF_1,

	SDE_CAPS_UBWC_2,

	SDE_CAPS_MAX,

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+2 −3
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ static int sde_rotator_update_clk(struct sde_rot_mgr *mgr) 


static void sde_rotator_footswitch_ctrl(struct sde_rot_mgr *mgr, bool on)

{

	struct sde_rot_data_type *mdata = sde_rot_get_mdata();

	int ret;



	if (WARN_ON(mgr->regulator_enable == on)) {
@@ -311,7 +310,7 @@ static void sde_rotator_footswitch_ctrl(struct sde_rot_mgr *mgr, bool on) 
	SDEROT_EVTLOG(on);

	SDEROT_DBG("%s: rotator regulators\n", on ? "Enable" : "Disable");



	if (test_bit(SDE_CAPS_MIN_BUS_VOTE, mdata->sde_caps_map) && on) {

	if (on) {

		mgr->minimum_bw_vote = mgr->enable_bw_vote;

		sde_rotator_update_perf(mgr);

	}
@@ -330,7 +329,7 @@ static void sde_rotator_footswitch_ctrl(struct sde_rot_mgr *mgr, bool on) 
	if (mgr->ops_hw_post_pmevent)

		mgr->ops_hw_post_pmevent(mgr, on);



	if (test_bit(SDE_CAPS_MIN_BUS_VOTE, mdata->sde_caps_map) && !on) {

	if (!on) {

		mgr->minimum_bw_vote = 0;

		sde_rotator_update_perf(mgr);

	}

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+0 −1
Original line number Diff line number Diff line
@@ -2366,7 +2366,6 @@ static int sde_rotator_hw_rev_init(struct sde_hw_rotator *rot) 
	/* features exposed via mdss h/w version */

	if (IS_SDE_MAJOR_MINOR_SAME(mdata->mdss_version, SDE_MDP_HW_REV_400)) {

		SDEROT_DBG("Supporting sys cache inline rotation\n");

		set_bit(SDE_CAPS_MIN_BUS_VOTE,  mdata->sde_caps_map);

		set_bit(SDE_CAPS_SBUF_1,  mdata->sde_caps_map);

		set_bit(SDE_CAPS_UBWC_2,  mdata->sde_caps_map);

		rot->inpixfmts = sde_hw_rotator_v4_inpixfmts;