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

Commit bd468d54 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: Fix argument in bus scale set quota"

parents cbe112ed 78c119f8

drivers/video/msm/mdss/mdss.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ enum mdss_hw_index { 
	MDSS_HW_DSI1,

	MDSS_HW_HDMI,

	MDSS_HW_EDP,

	MDSS_HW_IOMMU,

	MDSS_MAX_HW_BLK

};
@@ -118,6 +117,7 @@ enum mdss_bus_clients { 
	MDSS_MDP_RT,

	MDSS_DSI_RT,

	MDSS_MDP_NRT,

	MDSS_IOMMU_RT,

	MDSS_MAX_BUS_CLIENTS

};

drivers/video/msm/mdss/mdss_mdp.c

+2 −2
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ int mdss_iommu_ctrl(int enable) 
		 */

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

			if (mdata->needs_iommu_bw_vote)

				mdss_bus_scale_set_quota(MDSS_HW_IOMMU,

				mdss_bus_scale_set_quota(MDSS_IOMMU_RT,

					SZ_1M, SZ_1M);

			rc = mdss_iommu_attach(mdata);

		}
@@ -817,7 +817,7 @@ int mdss_iommu_ctrl(int enable) 
			if (mdata->iommu_ref_cnt == 0) {

				rc = mdss_iommu_dettach(mdata);

				if (mdata->needs_iommu_bw_vote)

					mdss_bus_scale_set_quota(MDSS_HW_IOMMU,

					mdss_bus_scale_set_quota(MDSS_IOMMU_RT,

						0, 0);

			}

		} else {