From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Wed, 28 Dec 2016 05:48:20 +0000 (+0200)
Subject: rpi-config: add configurable CMA low and high water marks
X-Git-Tag: chinook_3.0.0~7
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=7b1d64975d3d6708c74e534c48230bb1e81bbdee;hp=d81c32990a65a8ea4e6da56f4fae54308826e034;p=AGL%2Fmeta-agl.git

rpi-config: add configurable CMA low and high water marks

For dynamically allocating of CMA blocks the low and high water marks
settings determine when the GPU requests or releases memory from the
CPU.

Change-Id: Iad494c101fec0884bb687c5ea51c9657b7c17bd9
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
(cherry picked from commit 6bcd449f3b6f9705dfe940d2011fce6243bac7de)
---

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
index ff14d3640..9222fd52a 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -1,6 +1,14 @@
 DISABLE_OVERSCAN = "1"
 
 do_deploy_append() {
+    if [ "${ENABLE_CMA}" = "1" ] && [ -n "${CMA_LWM}" ]; then
+        sed -i '/#cma_lwm/ c\cma_lwm=${CMA_LWM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
+
+    if [ "${ENABLE_CMA}" = "1" ] && [ -n "${CMA_HWM}" ]; then
+        sed -i '/#cma_hwm/ c\cma_hwm=${CMA_HWM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
+
     echo "avoid_warnings=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     echo "mask_gpu_interrupt0=0x400" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     echo "dtoverlay=vc4-kms-v3d-overlay,cma-256" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt