From f9ce28f2c729855f5f83d0e6ccb395ead4708973 Mon Sep 17 00:00:00 2001 From: Aravind Venkateswaran Date: Tue, 21 Jun 2016 18:03:25 -0700 Subject: [PATCH 1/2] ARM: dts: msm: reserve memory for continuous splash on msmcobalt Reserve memory for the display framebuffer in HLOS for continuous splash feature on msmcobalt target. This memory buffer would be configured by the bootloader and needs to be retained until the first frame update in kernel. CRs-Fixed: 1037857 Change-Id: Ifbcc1454a1c85eb0163fed969a0c8ceb21d23245 Signed-off-by: Aravind Venkateswaran --- arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi | 3 +++ arch/arm/boot/dts/qcom/msmcobalt.dtsi | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi index 3018ecd4e5eb..65206e97d767 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi @@ -255,6 +255,9 @@ mdss_fb0: qcom,mdss_fb_primary { cell-index = <0>; compatible = "qcom,mdss-fb"; + qcom,cont-splash-memory { + linux,contiguous-region = <&cont_splash_mem>; + }; }; mdss_fb1: qcom,mdss_fb_wfd { diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index aa9390de6525..07a2af29c724 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -333,6 +333,11 @@ size = <0 0x2000000>; linux,cma-default; }; + + cont_splash_mem: splash_region@9d600000 { + reg = <0x0 0x9d600000 0x0 0x02400000>; + label = "cont_splash_mem"; + }; }; }; From 03f57a4a98166c03ffc919999bb8009cb07bd7ad Mon Sep 17 00:00:00 2001 From: Aravind Venkateswaran Date: Tue, 21 Jun 2016 18:05:34 -0700 Subject: [PATCH 2/2] ARM: dts: msm: add proxy vote for mdss gdsc for msmcobalt When continuous splash screen feature is enabled, the display needs to be kept alive during the kernel boot up. Add proxy vote for MDSS GDSC to prevent it from being turned off until the display driver hand off can be executed. CRs-Fixed: 1037857 Change-Id: Ie111c5d4fb401a04620809b84ba6a7c2e7d1ce88 Signed-off-by: Aravind Venkateswaran --- arch/arm/boot/dts/qcom/msmcobalt.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index 07a2af29c724..58e8883ba97c 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -2894,6 +2894,8 @@ clock-names = "bus_clk", "rot_clk"; clocks = <&clock_mmss clk_mmss_mdss_axi_clk>, <&clock_mmss clk_mmss_mdss_rot_clk>; + proxy-supply = <&gdsc_mdss>; + qcom,proxy-consumer-enable; status = "ok"; };