From 36d5fdbf048db65dcab34d379571755db3948771 Mon Sep 17 00:00:00 2001 From: Zhao Yakui Date: Thu, 16 Aug 2018 14:38:30 +0800 Subject: [PATCH] DM/Samples: Add the boot option of "i915.enable_guc=0" to disable guc on SOS 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. V1->V2: Add the option on APL-NUC platform Signed-off-by: Zhao Yakui Reviewed-by: Binbin Wu --- devicemodel/samples/apl-mrb/sos_bootargs_debug.txt | 2 +- devicemodel/samples/apl-mrb/sos_bootargs_release.txt | 2 +- hypervisor/bsp/uefi/clearlinux/acrn.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt index 53cdac058..1c0394a85 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt @@ -1 +1 @@ -pci_devices_ignore=(0:18:2) console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 hvlog=2M@0x6de00000 reboot_panic=p,w cma=32M@0- +pci_devices_ignore=(0:18:2) console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 i915.enable_guc=0 hvlog=2M@0x6de00000 reboot_panic=p,w cma=32M@0- diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt index b31ea60d2..5c0d4dabc 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt @@ -1 +1 @@ -console=tty0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 cma=32M@0- +console=tty0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait quiet loglevel=3 no_timer_check consoleblank=0 i915.enable_initial_modeset=1 i915.tsd_init=7 i915.tsd_delay=2000 video=DP-1:d video=DP-2:d i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 i915.enable_guc=0 cma=32M@0- diff --git a/hypervisor/bsp/uefi/clearlinux/acrn.conf b/hypervisor/bsp/uefi/clearlinux/acrn.conf index 51fa257e0..43a754c4f 100755 --- a/hypervisor/bsp/uefi/clearlinux/acrn.conf +++ b/hypervisor/bsp/uefi/clearlinux/acrn.conf @@ -1,3 +1,3 @@ title The ACRN Service OS linux /EFI/org.clearlinux/kernel-org.clearlinux.pk414-sos.4.14.52-63 -options pci_devices_ignore=(0:18:1) console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=PARTUUID= rw rootwait ignore_loglevel no_timer_check consoleblank=0 i915.tsd_init=7 i915.tsd_delay=2000 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 i915.enable_initial_modeset=1 hvlog=2M@0x1FE00000 +options pci_devices_ignore=(0:18:1) console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=PARTUUID= rw rootwait ignore_loglevel no_timer_check consoleblank=0 i915.tsd_init=7 i915.tsd_delay=2000 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 i915.enable_initial_modeset=1 i915.enable_guc=0 hvlog=2M@0x1FE00000