Skip to content

Commit 3b6c885

Browse files
feijiang1wenlingz
authored andcommitted
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 <fei.jiang@intel.com> Reviewed-by: Min He <min.he@intel.com>
1 parent 6494708 commit 3b6c885

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

devicemodel/samples/apl-mrb/launch_uos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ acrn-dm -A -m $mem_size -c $2$boot_GVT_option"$GVT_args" -s 0:0,hostbridge -s 1:
122122
-B "root=/dev/vda2 rw rootwait maxcpus=$2 nohpet console=hvc0 \
123123
console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \
124124
consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 i915.enable_guc_loading=0 \
125-
i915.enable_hangcheck=0 i915.nuclear_pageflip=1 i915.enable_initial_modeset=1" $vm_name
125+
i915.enable_hangcheck=0 i915.nuclear_pageflip=1" $vm_name
126126
}
127127

128128
function launch_android()
@@ -242,7 +242,7 @@ fi
242242
kernel_cmdline_generic="maxcpus=$2 nohpet tsc=reliable intel_iommu=off \
243243
androidboot.serialno=$ser \
244244
i915.enable_rc6=1 i915.enable_fbc=1 i915.enable_guc_loading=0 i915.avail_planes_per_pipe=$4 \
245-
i915.enable_hangcheck=0 use_nuclear_flip=1 i915.enable_initial_modeset=1 "
245+
i915.enable_hangcheck=0 use_nuclear_flip=1"
246246

247247
boot_dev_flag=",b"
248248
if [ $6 == 1 ];then

devicemodel/samples/nuc/launch_uos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \
2929
-B "root=/dev/vda3 rw rootwait maxcpus=$2 nohpet console=tty0 console=hvc0 \
3030
console=ttyS0 no_timer_check ignore_loglevel log_buf_len=16M \
3131
consoleblank=0 tsc=reliable i915.avail_planes_per_pipe=$4 \
32-
i915.enable_hangcheck=0 i915.nuclear_pageflip=1 i915.enable_initial_modeset=1" $vm_name
32+
i915.enable_hangcheck=0 i915.nuclear_pageflip=1" $vm_name
3333
}
3434

3535
launch_clear 2 1 "64 448 8" 0x070F00 clear

0 commit comments

Comments
 (0)