From 3b6c8852869a1163962ae6b9e4342d5d97dec76a Mon Sep 17 00:00:00 2001 From: Fei Jiang Date: Fri, 6 Jul 2018 14:16:45 +0800 Subject: [PATCH] launch_uos: remove enable_initial_modeset for UOS Some UOS need use FB device to display, while initial_modeset will disable fb, so we need remove correlation between plane restriction and initial modeset in kernel driver, also don't need set enable_initial_modeset in launch script. Signed-off-by: Fei Jiang Reviewed-by: Min He --- 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 3c313fcef..a1222c142 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -122,7 +122,7 @@ 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 i915.enable_initial_modeset=1" $vm_name + i915.enable_hangcheck=0 i915.nuclear_pageflip=1" $vm_name } function launch_android() @@ -242,7 +242,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_initial_modeset=1 " + i915.enable_hangcheck=0 use_nuclear_flip=1" 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 fd1aad3ba..64f2b8e72 100755 --- a/devicemodel/samples/nuc/launch_uos.sh +++ b/devicemodel/samples/nuc/launch_uos.sh @@ -29,7 +29,7 @@ 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_initial_modeset=1" $vm_name + i915.enable_hangcheck=0 i915.nuclear_pageflip=1" $vm_name } launch_clear 2 1 "64 448 8" 0x070F00 clear