From 434483270097b517485c2d4af0cc595e8a3da7a0 Mon Sep 17 00:00:00 2001 From: Xinyun Liu Date: Mon, 23 Jul 2018 17:00:39 +0800 Subject: [PATCH] Revert "DM sample: force enabling HDMI1 and HDMI2 connectors" This reverts commit 47116e8c4bd239d6a1ca5bf7f3300aecdf532609. if eDP panel connected, something wrong happens: eDP HDMI1 HDMI2 --------------------------------------------------------- SOS UOS1 UOS1 Good. SOS UOS1 BAD. SOS is OK. NO show in HDMI1 SOS UOS1 BAD. SOS is OK. NO show in HDMI2 SOS BAD. This is also a temp solution: if only HDMI2 is connected, SOS will be shown on HDMI2. But UOS1 is expected in some cases. Signed-off-by: Xinyun Liu Reviewed-by: Min He --- devicemodel/samples/apl-mrb/sos_bootargs_debug.txt | 2 +- devicemodel/samples/apl-mrb/sos_bootargs_release.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt b/devicemodel/samples/apl-mrb/sos_bootargs_debug.txt index bcdac70f3..151faf671 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 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 video=HDMI-A-1:e video=HDMI-A-2:e 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) maxcpus=1 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- diff --git a/devicemodel/samples/apl-mrb/sos_bootargs_release.txt b/devicemodel/samples/apl-mrb/sos_bootargs_release.txt index 57c8de361..6717c89e6 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 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 video=HDMI-A-1:e video=HDMI-A-2:e 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- +maxcpus=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-