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

Commit acd0b950 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Id2e85bcf,I7dc3252c into dev/msm-4.14-display 

* changes:
  drm/msm/sde: report rsc timeout state
  ARM: dts: msm: add display preferences for sm8150
parents 68b362a9 c6669ac4

arch/arm64/boot/dts/qcom/sm8150-sde.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ 
		qcom,sde-ctl-off = <0x2000 0x2200 0x2400

				     0x2600 0x2800 0x2a00>;

		qcom,sde-ctl-size = <0x1e0>;

		qcom,sde-ctl-display-pref = "primary", "primary", "none",

		qcom,sde-ctl-display-pref = "primary", "none", "none",

			    "none", "none";



		qcom,sde-mixer-off = <0x45000 0x46000 0x47000

				      0x48000 0x49000 0x4a000>;

		qcom,sde-mixer-size = <0x320>;

		qcom,sde-mixer-display-pref = "primary", "primary", "none",

		qcom,sde-mixer-display-pref = "primary", "none", "none",

					      "none", "none", "none";



		qcom,sde-dspp-top-off = <0x1300>;
@@ -92,6 +92,7 @@ 
		qcom,sde-pp-slave = <0x0 0x0 0x0 0x0 0x0 0x0>;

		qcom,sde-pp-size = <0xd4>;

		qcom,sde-pp-merge-3d-id = <0x0 0x0 0x1 0x1 0x2 0x2>;

		qcom,sde-te-source = <0x0 0x1 0x0 0x0 0x0>;



		qcom,sde-merge-3d-off = <0x84000 0x84100 0x84200>;

		qcom,sde-merge-3d-size = <0x100>;

drivers/gpu/drm/msm/sde_rsc.c

+10 −2
Original line number Diff line number Diff line
@@ -595,8 +595,12 @@ static int sde_rsc_switch_to_clk(struct sde_rsc_priv *rsc, 
			msecs_to_jiffies(PRIMARY_VBLANK_WORST_CASE_MS*2));

		if (!rc) {

			pr_err("Timeout waiting for vsync\n");

			SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait),

			rc = -ETIMEDOUT;

			SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc,

				SDE_EVTLOG_ERROR);

		} else {

			SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc);

			rc = 0;

		}

	}

end:
@@ -651,8 +655,12 @@ static int sde_rsc_switch_to_vid(struct sde_rsc_priv *rsc, 
			msecs_to_jiffies(PRIMARY_VBLANK_WORST_CASE_MS*2));

		if (!rc) {

			pr_err("Timeout waiting for vsync\n");

			SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait),

			rc = -ETIMEDOUT;

			SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc,

				SDE_EVTLOG_ERROR);

		} else {

			SDE_EVT32(atomic_read(&rsc->rsc_vsync_wait), rc);

			rc = 0;

		}

	}