diff --git a/qcom/pineapple-vm.dtsi b/qcom/pineapple-vm.dtsi index 4d50b094..e135fdf0 100644 --- a/qcom/pineapple-vm.dtsi +++ b/qcom/pineapple-vm.dtsi @@ -12,7 +12,7 @@ interrupt-parent = <&vgic>; chosen { - bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce"; + bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce memhp_default_state=online_movable"; }; cpus { diff --git a/qcom/sun-dma-heaps.dtsi b/qcom/sun-dma-heaps.dtsi index f468d650..f0def0d5 100644 --- a/qcom/sun-dma-heaps.dtsi +++ b/qcom/sun-dma-heaps.dtsi @@ -8,6 +8,14 @@ &soc { qcom,dma-heaps { compatible = "qcom,dma-heaps"; + + qcom,display { + qcom,dma-heap-name = "qcom,display"; + qcom,dma-heap-type = ; + qcom,max-align = <9>; + memory-region = <&non_secure_display_memory>; + }; + qcom,qseecom { qcom,dma-heap-name = "qcom,qseecom"; qcom,dma-heap-type = ; diff --git a/qcom/sun-vm.dtsi b/qcom/sun-vm.dtsi index a7512ae6..d90b4ff4 100644 --- a/qcom/sun-vm.dtsi +++ b/qcom/sun-vm.dtsi @@ -13,7 +13,7 @@ interrupt-parent = <&vgic>; chosen { - bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce"; + bootargs = "nokaslr log_buf_len=256K console=hvc0 loglevel=8 swiotlb=noforce memhp_default_state=online_movable"; }; cpus { diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index 2b136bd8..c206772e 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -3392,6 +3392,14 @@ size = <0x0 0xC00000>; }; + non_secure_display_memory: non_secure_display_region { + compatible = "shared-dma-pool"; + reusable; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + size = <0x0 0xa400000>; + alignment = <0x0 0x400000>; + }; + kinfo_mem: debug_kinfo_region { alloc-ranges = <0x0 0x00000000 0xffffffff 0xffffffff>; size = <0x0 0x1000>;