Skip to content

Commit 9114fbb

Browse files
yakuizhaowenlingz
authored andcommitted
Revert "DM: Disable plane_restriction on 4.19 kernel"
This reverts commit 072e77e so that plane_restriction can be enabled. Tracked-on: #1373 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Reviewed-by: He, Min <min.he@intel.com>
1 parent c3ebd6f commit 9114fbb

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

devicemodel/samples/apl-mrb/launch_uos.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,18 +399,12 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do
399399
fi
400400
done
401401

402-
gvt_args=0x070F00
403-
# this is the temporal solution before plane_restriction is ready on 4.19
404-
if [ "$kernel_version" = "4.19" ]; then
405-
gvt_args=0
406-
fi
407-
408402
case $launch_type in
409403
1) echo "Launch clearlinux UOS"
410-
launch_clearlinux 1 3 "64 448 8" $gvt_args clearlinux "LaaG" $debug
404+
launch_clearlinux 1 3 "64 448 8" 0x070F00 clearlinux "LaaG" $debug
411405
;;
412406
2) echo "Launch android UOS"
413-
launch_android 1 3 "64 448 8" $gvt_args android "AaaG" $debug
407+
launch_android 1 3 "64 448 8" 0x070F00 android "AaaG" $debug
414408
;;
415409
3) echo "Launch clearlinux UOS + android UOS"
416410
launch_android 1 2 "64 448 4" 0x00000C android "AaaG" $debug &

devicemodel/samples/nuc/launch_uos.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

3-
kernel_version=$(uname -r | awk -F. '{ printf("%d.%d", $1,$2) }')
4-
53
function launch_clear()
64
{
75
vm_name=vm$1
@@ -43,10 +41,4 @@ for i in `ls -d /sys/devices/system/cpu/cpu[1-99]`; do
4341
fi
4442
done
4543

46-
gvt_args=0x070F00
47-
# this is the temporal solution before plane_restriction is ready on 4.19
48-
if [ "$kernel_version" = "4.19" ]; then
49-
gvt_args=0
50-
fi
51-
52-
launch_clear 1 1 "64 448 8" $gvt_args clear
44+
launch_clear 1 1 "64 448 8" 0x070F00 clear

0 commit comments

Comments
 (0)