demo: Fix demo script to reorder apps master
authorNikhil Devshatwar <a0132237@ti.com>
Mon, 14 Oct 2019 16:35:26 +0000 (22:05 +0530)
committerNikhil Devshatwar <a0132237@ti.com>
Tue, 15 Oct 2019 13:03:25 +0000 (18:33 +0530)
cluster VM:
- Kill matix gui and weston before GPU based cluster app
- Make sure cluster app runs first before starting the VM
- Wait after killing weston before starting cluster

Infotainment VM:
- Add sleep before launching GPU apps
- Update gst-launch command to fix kernel warnings

Run GPU test on root cell before launching a VM with vGPU

Signed-off-by: Nikhil Devshatwar <a0132237@ti.com>
demo/cockpit-demo-cluster-VM.sh
demo/cockpit-demo-infotainment-VM.sh
demo/jailhouse-launch-VM.sh

index 8e664a9f7a7b25318b8667b66fa7a3134dd4d6fb..c33f3d821b2acb17793632438b12fe8e1d1bf2d3 100755 (executable)
@@ -8,13 +8,20 @@ monitor_ivi_vm() {
 }
 
 
 }
 
 
+launch_cluster() {
+       pkill matrix
+       pkill weston
+       sleep 2
+       cluster -d /dev/dri/card0 </dev/null
+}
 ####### Start here
 ##################
 
 ####### Start here
 ##################
 
-/usr/share/ti/util-scripts/demo/jailhouse-launch-VM.sh
+launch_cluster 2>/dev/null  1>&2 &
 
 
-cluster -d /dev/dri/card0 </dev/null 2>/dev/null  1>&2 &
+/usr/share/ti/util-scripts/demo/jailhouse-launch-VM.sh
 
 monitor_ivi_vm 2>/dev/null  1>&2 &
 
 /usr/share/ti/util-scripts/demo/crash-VM.sh 2>/dev/null  1>&2 &
 
 monitor_ivi_vm 2>/dev/null  1>&2 &
 
 /usr/share/ti/util-scripts/demo/crash-VM.sh 2>/dev/null  1>&2 &
+
index a3f5b226cf412eb5f0b7bc39794c7ac9caa5a9dd..20470a7ae3f2dae7758ee2e69f0083f9759c2934 100755 (executable)
@@ -20,7 +20,7 @@ run_multimedia() {
        do
                for i in $CLIPLIST;
                do
        do
                for i in $CLIPLIST;
                do
-                       gst-launch-1.0 filesrc location=/usr/share/ti/video/$i ! h265parse ! v4l2h265dec ! waylandsink
+                       gst-launch-1.0 filesrc location=/usr/share/ti/video/$i ! h265parse ! v4l2h265dec ! video/x-raw,format=NV12 ! waylandsink
                done
        done
 }
                done
        done
 }
@@ -32,6 +32,7 @@ run_multimedia() {
 msleep 500
 . /etc/profile
 
 msleep 500
 . /etc/profile
 
+sleep 2
 run_gfx_apps 2>/dev/null 1>&2 &
 
 run_multimedia 2>/dev/null 1>&2 &
 run_gfx_apps 2>/dev/null 1>&2 &
 
 run_multimedia 2>/dev/null 1>&2 &
index 3171113c0a5591aa4c9ba0bd9a383d6b812aa176..ad87b6fdf9251259c52c0af58b04829ac85b608c 100755 (executable)
@@ -1,3 +1,10 @@
+#!/bin/bash
+#Utility for creating and launching the inmate VM with Linux
+
+#Kick the root cell GPU test application before launching the vGPU
+rgx_compute_test
+
+#Create and launch the VM
 jailhouse enable /usr/share/jailhouse/cells/k3-j721e-evm.cell
 jailhouse cell linux -a arm64 -d /usr/share/jailhouse/inmate-k3-j721e-evm.dtb -c "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait" /usr/share/jailhouse/cells/k3-j721e-evm-linux-demo.cell /boot/Image
 
 jailhouse enable /usr/share/jailhouse/cells/k3-j721e-evm.cell
 jailhouse cell linux -a arm64 -d /usr/share/jailhouse/inmate-k3-j721e-evm.dtb -c "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait" /usr/share/jailhouse/cells/k3-j721e-evm-linux-demo.cell /boot/Image