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

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

Merge changes I209da502,Ieaa03e8e into msm-4.14 

* changes:
  ARM: dts: msm: Enable SDE rotator and power domain
  drm/msm/sde: select the PM generic domain framework with DRM_MSM
parents 0b07e62e bb1e0488

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

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		#power-domain-cells = <0>;



		/* hw blocks */

		qcom,sde-off = <0x1000>;

		qcom,sde-len = <0x45c>;

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config DRM_MSM 
	select SND_SOC_HDMI_CODEC if SND_SOC

	select SYNC_FILE

	select MSM_EXT_DISPLAY

	select PM_GENERIC_DOMAINS

	default y

	help

	  DRM/KMS driver for MSM/snapdragon.