Merge "Revert "ARM: dts: msm: configure CX voltage levels from MDSS for msmcobalt"" (c480cfd4) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,9 +21,6 @@
		interrupt-controller;
		#interrupt-cells = <1>;
		vdd-supply = <&gdsc_mdss>;
		vdd-cx-supply = <&pmcobalt_s1_level>;
		vdd-cx-min-uV = <RPM_SMD_REGULATOR_LEVEL_LOW_SVS>;
		vdd-cx-max-uV = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

		/* Bus Scale Settings */
		qcom,msm-bus,name = "mdss_mdp";

drivers/video/fbdev/msm/mdss.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ enum mdss_hw_quirk {
		MDSS_QUIRK_FMT_PACK_PATTERN,
		MDSS_QUIRK_NEED_SECURE_MAP,
		MDSS_QUIRK_SRC_SPLIT_ALWAYS,
		MDSS_QUIRK_MMSS_GDSC_COLLAPSE,
		MDSS_QUIRK_MAX,
		};

drivers/video/fbdev/msm/mdss_mdp.c

+30 −0

Original line number	Diff line number	Diff line
		@@ -1831,6 +1831,20 @@ static u32 mdss_get_props(void)
		return props;
		}

		static void mdss_rpm_set_msg_ram(bool enable)
		{
		u32 read_reg = 0;
		void __iomem *rpm_msg_ram = ioremap(0x7781FC, 4);

		if (rpm_msg_ram) {
		writel_relaxed(enable, rpm_msg_ram);
		read_reg = readl_relaxed(rpm_msg_ram);
		pr_debug("%s enable=%d read_val=%x\n", __func__, enable,
		read_reg);
		iounmap(rpm_msg_ram);
		}
		}

		void mdss_mdp_init_default_prefill_factors(struct mdss_data_type *mdata)
		{
		mdata->prefill_data.prefill_factors.fmt_mt_nv12_factor = 8;
		@@ -2000,6 +2014,7 @@ static void mdss_mdp_hw_rev_caps_init(struct mdss_data_type *mdata)
		mdss_mdp_init_default_prefill_factors(mdata);
		mdss_set_quirk(mdata, MDSS_QUIRK_DSC_RIGHT_ONLY_PU);
		mdss_set_quirk(mdata, MDSS_QUIRK_DSC_2SLICE_PU_THRPUT);
		mdss_set_quirk(mdata, MDSS_QUIRK_MMSS_GDSC_COLLAPSE);
		mdata->has_wb_ubwc = true;
		set_bit(MDSS_CAPS_10_BIT_SUPPORTED, mdata->mdss_caps_map);
		set_bit(MDSS_CAPS_AVR_SUPPORTED, mdata->mdss_caps_map);
		@@ -4884,6 +4899,13 @@ static void mdss_mdp_footswitch_ctrl(struct mdss_data_type *mdata, int on)
		pr_debug("Disable MDP FS\n");
		active_cnt = atomic_read(&mdata->active_intf_cnt);
		if (active_cnt != 0) {
		/*
		* Advise RPM to not turn MMSS GDSC off during
		* idle case.
		*/
		if (mdss_has_quirk(mdata,
		MDSS_QUIRK_MMSS_GDSC_COLLAPSE))
		mdss_rpm_set_msg_ram(true);
		/*
		* Turning off GDSC while overlays are still
		* active.
		@@ -4893,6 +4915,14 @@ static void mdss_mdp_footswitch_ctrl(struct mdss_data_type *mdata, int on)
		active_cnt);
		mdss_mdp_memory_retention_enter();
		} else {
		/*
		* Advise RPM to turn MMSS GDSC off during
		* suspend case
		*/
		if (mdss_has_quirk(mdata,
		MDSS_QUIRK_MMSS_GDSC_COLLAPSE))
		mdss_rpm_set_msg_ram(false);

		mdss_mdp_cx_ctrl(mdata, false);
		mdss_mdp_batfet_ctrl(mdata, false);
		}