Merge "ARM: dts: qcom: enable display on trusted vm for yupik"

This commit is contained in:
qctecmdr 2021-02-07 22:42:28 -08:00 • committed by Gerrit - the friendly Code Review server
commit 60da1ce988
3 changed files with 24 additions and 0 deletions

View file

@ -54,6 +54,12 @@
memory-region = <&audio_cma_mem>;
qcom,ion-heap-type = "DMA";
};
qcom,ion-heap@3 { /* NON SECURE DISPLAY HEAP */
reg = <ION_DISPLAY_HEAP_ID>;
memory-region = <&non_secure_display_memory>;
qcom,ion-heap-type = "DMA";
};
};
};

View file

@ -1,4 +1,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,dispcc-yupik.h>
#include <dt-bindings/clock/qcom,gcc-yupik.h>
#include <dt-bindings/clock/qcom,rpmh.h>
/ {
#address-cells = <0x2>;
@ -297,3 +300,5 @@
};
};
#include "lahaina-vm-ion.dtsi"
#include "display/trustedvm-yupik-sde.dtsi"
#include "display/trustedvm-yupik-sde-display.dtsi"

View file

@ -446,6 +446,19 @@
size = <0x0 0x1400000>;
};
non_secure_display_memory: non_secure_display_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0x6400000>;
};
splash_memory:splash_region {
reg = <0x0 0xe1000000 0x0 0x02400000>;
label = "cont_splash_region";
};
qseecom_ta_mem: qseecom_ta_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;