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

Commit 9b9072f1 authored by Kalyan Thota's avatar Kalyan Thota
Browse files

msm: mdss: add min vote on the bus before iommu attach 



MDSS needs a min vote on sysmmnoc clk to perform TZ and
IOMMU operations. This vote is needed for few low tier
chipsets.

Change-Id: Iff8c775bfc2001f0bae5118427334793bf392bc0
Signed-off-by: default avatarKalyan Thota <kalyant@codeaurora.org>
parent 1c2c6d7f

drivers/video/msm/mdss/mdss.h

+3 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -134,6 +134,7 @@ enum mdss_hw_index { 
enum mdss_bus_clients {

enum mdss_bus_clients {

	MDSS_MDP_RT,

	MDSS_MDP_RT,

	MDSS_DSI_RT,

	MDSS_DSI_RT,

	MDSS_HW_RT,

	MDSS_MDP_NRT,

	MDSS_MDP_NRT,

	MDSS_MAX_BUS_CLIENTS

	MDSS_MAX_BUS_CLIENTS

};

};
@@ -156,6 +157,7 @@ enum mdss_hw_quirk { 
	MDSS_QUIRK_DSC_RIGHT_ONLY_PU,

	MDSS_QUIRK_DSC_RIGHT_ONLY_PU,

	MDSS_QUIRK_DSC_2SLICE_PU_THRPUT,

	MDSS_QUIRK_DSC_2SLICE_PU_THRPUT,

	MDSS_QUIRK_DMA_BI_DIR,

	MDSS_QUIRK_DMA_BI_DIR,

	MDSS_QUIRK_MIN_BUS_VOTE,

	MDSS_QUIRK_MAX,

	MDSS_QUIRK_MAX,

};

};

drivers/video/msm/mdss/mdss_mdp.c

+18 −3
Original line number Original line Diff line number Diff line 
/*

/*

 * MDSS MDP Interface (used by framebuffer core)

 * MDSS MDP Interface (used by framebuffer core)

 *

 *

 * Copyright (c) 2007-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2007-2016, The Linux Foundation. All rights reserved.

 * Copyright (C) 2007 Google Incorporated

 * Copyright (C) 2007 Google Incorporated

 *

 *

 * This software is licensed under the terms of the GNU General Public

 * This software is licensed under the terms of the GNU General Public
@@ -742,6 +742,9 @@ static inline void __mdss_mdp_reg_access_clk_enable( 
	if (enable) {

	if (enable) {

		mdss_update_reg_bus_vote(mdata->reg_bus_clt,

		mdss_update_reg_bus_vote(mdata->reg_bus_clt,

				VOTE_INDEX_19_MHZ);

				VOTE_INDEX_19_MHZ);

		if (mdss_has_quirk(mdata, MDSS_QUIRK_MIN_BUS_VOTE))

				mdss_bus_scale_set_quota(MDSS_HW_RT,

					SZ_1M, SZ_1M);

		mdss_mdp_clk_update(MDSS_CLK_AHB, 1);

		mdss_mdp_clk_update(MDSS_CLK_AHB, 1);

		mdss_mdp_clk_update(MDSS_CLK_AXI, 1);

		mdss_mdp_clk_update(MDSS_CLK_AXI, 1);

		mdss_mdp_clk_update(MDSS_CLK_MDP_CORE, 1);

		mdss_mdp_clk_update(MDSS_CLK_MDP_CORE, 1);
@@ -749,6 +752,8 @@ static inline void __mdss_mdp_reg_access_clk_enable( 
		mdss_mdp_clk_update(MDSS_CLK_MDP_CORE, 0);

		mdss_mdp_clk_update(MDSS_CLK_MDP_CORE, 0);

		mdss_mdp_clk_update(MDSS_CLK_AXI, 0);

		mdss_mdp_clk_update(MDSS_CLK_AXI, 0);

		mdss_mdp_clk_update(MDSS_CLK_AHB, 0);

		mdss_mdp_clk_update(MDSS_CLK_AHB, 0);

		if (mdss_has_quirk(mdata, MDSS_QUIRK_MIN_BUS_VOTE))

			mdss_bus_scale_set_quota(MDSS_HW_RT, 0, 0);

		mdss_update_reg_bus_vote(mdata->reg_bus_clt,

		mdss_update_reg_bus_vote(mdata->reg_bus_clt,

				VOTE_INDEX_DISABLE);

				VOTE_INDEX_DISABLE);

	}

	}
@@ -827,14 +832,23 @@ int mdss_iommu_ctrl(int enable) 
		 * delay iommu attach until continous splash screen has

		 * delay iommu attach until continous splash screen has

		 * finished handoff, as it may still be working with phys addr

		 * finished handoff, as it may still be working with phys addr

		 */

		 */

		if (!mdata->iommu_attached && !mdata->handoff_pending)

		if (!mdata->iommu_attached && !mdata->handoff_pending) {

			if (mdss_has_quirk(mdata, MDSS_QUIRK_MIN_BUS_VOTE))

				mdss_bus_scale_set_quota(MDSS_HW_RT,

					 SZ_1M, SZ_1M);

			rc = mdss_smmu_attach(mdata);

			rc = mdss_smmu_attach(mdata);

		}

		mdata->iommu_ref_cnt++;

		mdata->iommu_ref_cnt++;

	} else {

	} else {

		if (mdata->iommu_ref_cnt) {

		if (mdata->iommu_ref_cnt) {

			mdata->iommu_ref_cnt--;

			mdata->iommu_ref_cnt--;

			if (mdata->iommu_ref_cnt == 0)

			if (mdata->iommu_ref_cnt == 0) {

				rc = mdss_smmu_detach(mdata);

				rc = mdss_smmu_detach(mdata);

				if (mdss_has_quirk(mdata,

					MDSS_QUIRK_MIN_BUS_VOTE))

					mdss_bus_scale_set_quota(MDSS_HW_RT,

								0, 0);

			}

		} else {

		} else {

			pr_err("unbalanced iommu ref\n");

			pr_err("unbalanced iommu ref\n");

		}

		}
@@ -1300,6 +1314,7 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata) 
		mdss_mdp_init_default_prefill_factors(mdata);

		mdss_mdp_init_default_prefill_factors(mdata);

		set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);

		set_bit(MDSS_QOS_OTLIM, mdata->mdss_qos_map);

		mdss_set_quirk(mdata, MDSS_QUIRK_DMA_BI_DIR);

		mdss_set_quirk(mdata, MDSS_QUIRK_DMA_BI_DIR);

		mdss_set_quirk(mdata, MDSS_QUIRK_MIN_BUS_VOTE);

		break;

		break;

	default:

	default:

		mdata->max_target_zorder = 4; /* excluding base layer */

		mdata->max_target_zorder = 4; /* excluding base layer */