From 4a1f92224230ab04a1cb63b0ed6f92b557973d6a Mon Sep 17 00:00:00 2001 From: Fei Jiang Date: Thu, 31 May 2018 16:53:56 +0800 Subject: [PATCH] Revert "DM sample: update sos/uos boot arg to let UOS see two displays" This reverts commit 5b1c536eeeb1968ed6335fc3082de7c1fbd79185. For normal case, we connected two HDMI monitors, one for SOS, another for UOS. Previously UOS has problem when only see one display, it was the bug of user space driver, then to work around this issue, submit temp patch to let UOS see two displays. From latest info, after switch to use github latest user spce driver in stable branch, such problem was resolved. Then we need revert previous workaround patch, otherwise, UOS will show on both HDMI1 and HDMI2. --- devicemodel/samples/apl-mrb/launch_uos.sh | 2 +- devicemodel/samples/apl-mrb/sos_bootargs_debug.txt | 2 +- devicemodel/samples/apl-mrb/sos_bootargs_release.txt | 2 +- 3 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 06b2fde48..6147244cd 100755 --- a/devicemodel/samples/apl-mrb/launch_uos.sh +++ b/devicemodel/samples/apl-mrb/launch_uos.sh @@ -364,7 +364,7 @@ case $launch_type in launch_clearlinux 1 3 "64 448 8" 0x000C00 clearlinux 1 $debug ;; 6) echo "Launch android UOS" - launch_android 1 3 "64 448 8" 0x000C02 android 1 $debug + launch_android 1 3 "64 448 8" 0x000C00 android 1 $debug ;; 7) echo "Launch clearlinux UOS + android UOS" launch_android 1 2 "64 448 4" 0x00000C android 1 $debug & diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt index 2f422dc47..a33e277e3 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) maxcpus=1 console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait clocksource=hpet 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=0x01010D i915.domain_plane_owners=0x011011100010 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 +pci_devices_ignore=(0:18:2) maxcpus=1 console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait clocksource=hpet 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 diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt index 554383081..bee9b94f3 100644 --- a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt +++ b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt @@ -1 +1 @@ -maxcpus=1 console=tty0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait clocksource=hpet 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=0x01010D i915.domain_plane_owners=0x011011100010 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 +maxcpus=1 console=tty0 i915.nuclear_pageflip=1 root=/dev/mmcblk1p1 rw rootwait clocksource=hpet 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