From 99e8997504f67a73d0220312bf8a42e59ea8446b Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Thu, 16 Aug 2018 14:38:35 +0800 Subject: [PATCH] DM: Add boot option of "i915.enable_guc=0" to disable Guc on UOS new kernel The guc boot option is refined on the new linux kernel. The boot option of "i915.enable_guc=0" should be added in order to disable Guc instead of using "enable_guc_loading/submission". But in order to use the same boot option on multi kernel, both of them are kept. Signed-off-by: Zhao Yakui Reviewed-by: Binbin Wu --- devicemodel/samples/apl-mrb/launch_uos.sh | 4 ++-- devicemodel/samples/nuc/launch_uos.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh index 6595b6b6d..b624e5ed0 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -123,7 +123,7 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 i915.enable_guc_loading=0 \ i915.enable_hangcheck=0 i915.nuclear_pageflip=1 \ - i915.enable_guc_submission=0" $vm_name + i915.enable_guc_submission=0 i915.enable_guc=0" $vm_name } function launch_android() @@ -243,7 +243,7 @@ fi kernel_cmdline_generic="maxcpus=$2 nohpet tsc=reliable intel_iommu=off \ androidboot.serialno=$ser \ i915.enable_rc6=1 i915.enable_fbc=1 i915.enable_guc_loading=0 i915.avail_planes_per_pipe=$4 \ - i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=0" + i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=0 i915.enable_guc=0" boot_dev_flag=",b" if [ $6 == 1 ];then diff --git a/devicemodel/samples/nuc/launch_uos.sh b/devicemodel/samples/nuc/launch_uos.sh index 4efe8070f..1f08d154e 100755 --- a/devicemodel/samples/nuc/launch_uos.sh +++ b/devicemodel/samples/nuc/launch_uos.sh @@ -27,7 +27,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \ consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 \ i915.enable_hangcheck=0 i915.nuclear_pageflip=1 i915.enable_guc_loading=0 \ - i915.enable_guc_submission=0" $vm_name + i915.enable_guc_submission=0 i915.enable_guc=0" $vm_name } # offline SOS CPUs except BSP before launch UOS