From a0fbb2da8c5dc0de390ca372f8e8dc8b08390918 Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Tue, 10 Jul 2018 09:19:06 +0800 Subject: [PATCH] DM: Add boot option of "i915.enable_guc_submission=0" to disable guc submission on UOS Now the guc loading is disabled on UOS. In such case it won't use "GUC" mode to submit the GPU commands. So it is disabled explicitily to avoid the useless check on UOS. This is also aligned with that on SOS. Signed-off-by: Zhao Yakui Reviewed-by: He, Min --- devicemodel/samples/apl-mrb/launch_uos.sh | 5 +++-- devicemodel/samples/nuc/launch_uos.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/devicemodel/samples/apl-mrb/launch_uos.sh b/devicemodel/samples/apl-mrb/launch_uos.sh index a1222c142..8cadc408e 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -122,7 +122,8 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1: -B "root=/dev/vda2 rw rootwait maxcpus=$2 nohpet console=hvc0 \ 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" $vm_name + i915.enable_hangcheck=0 i915.nuclear_pageflip=1 \ + i915.enable_guc_submission=0" $vm_name } function launch_android() @@ -242,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_hangcheck=0 use_nuclear_flip=1 i915.enable_guc_submission=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 4fc9bc64f..27923cea1 100755 --- a/devicemodel/samples/nuc/launch_uos.sh +++ b/devicemodel/samples/nuc/launch_uos.sh @@ -29,7 +29,8 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ -B "root=/dev/vda3 rw rootwait maxcpus=$2 nohpet console=tty0 console=hvc0 \ 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" $vm_name + i915.enable_hangcheck=0 i915.nuclear_pageflip=1 i915.enable_guc_loading=0 \ + i915.enable_guc_submission=0" $vm_name } launch_clear 2 1 "64 448 8" 0x070F00 clear