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

Commit 589022a4 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 VIG3 and RGB3 pipes for APQ8084"

parents b3ee7560 9f9e334e

arch/arm/boot/dts/qti/apq8084-mdss.dtsi

+5 −6
Original line number Diff line number Diff line
@@ -39,19 +39,18 @@ 
		qcom,max-clk-rate = <320000000>;



		qcom,mdss-pipe-vig-off = <0x00001200 0x00001600

					  0x00001A00 0x00001E00>;

					  0x00001A00>;

		qcom,mdss-pipe-rgb-off = <0x00002200 0x00002600

					  0x00002A00 0x00002E00>;

					  0x00002A00>;

		qcom,mdss-pipe-dma-off = <0x00003200 0x00003600>;



		qcom,mdss-pipe-vig-fetch-id = <1 4 7 19>;

		qcom,mdss-pipe-rgb-fetch-id = <16 17 18 22>;

		qcom,mdss-pipe-vig-fetch-id = <1 4 7>;

		qcom,mdss-pipe-rgb-fetch-id = <16 17 18>;

		qcom,mdss-pipe-dma-fetch-id = <10 13>;



		qcom,mdss-pipe-rgb-fixed-mmb =	<2 0 1>,

						<2 2 3>,

						<2 4 5>,

						<2 6 7>;

						<2 4 5>;



		qcom,mdss-smp-data = <44 8192>;

drivers/video/msm/mdss/mdss_mdp.c

+9 −0
Original line number Diff line number Diff line
@@ -955,6 +955,15 @@ int mdss_hw_init(struct mdss_data_type *mdata) 
	mdata->mdp_rev = MDSS_MDP_REG_READ(MDSS_MDP_REG_HW_VERSION);

	pr_info_once("MDP Rev=%x\n", mdata->mdp_rev);



	/*

	 * This smp workaround is temporary until under-run root cause

	 * is identified and fix is implemented.

	 */

	if (mdata->mdp_rev == MDSS_MDP_HW_REV_103) {

		set_bit(0x6, mdata->mmb_alloc_map);

		set_bit(0x7, mdata->mmb_alloc_map);

	}



	/* disable hw underrun recovery */

	writel_relaxed(0x0, mdata->mdp_base +

			MDSS_MDP_REG_VIDEO_INTF_UNDERFLOW_CTL);