diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-02-19 20:47:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-21 09:39:00 +0000 |
| commit | fca233e5d424a05dcd19f5385d06d8f62e3e5a17 (patch) | |
| tree | 254c5bd05977f2acad6eb8e5f6b1645f9d431de1 | |
| parent | 2493f505e5820d8307dacd1c47d585d1e307ef34 (diff) | |
| download | poky-fca233e5d424a05dcd19f5385d06d8f62e3e5a17.tar.gz | |
qemumips: use std vga instead of cirrus vga
This is what the upstream recommends nowadays:
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
I have verified that both X and weston continue to boot and look
right; however xorg.conf file needs to be removed as it is cirrus
specific and doesn't work and isn't needed with std vga.
(From OE-Core rev: 96e6434239268fd0fc021bda9c8fedd998597097)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 1 insertions, 79 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index d44b96c18c..f1f7c2ae20 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
| @@ -7,4 +7,4 @@ QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | |||
| 7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
| 8 | 8 | ||
| 9 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 9 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
| 10 | QB_OPT_APPEND += "-device cirrus-vga" | 10 | QB_OPT_APPEND += "-vga std" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf deleted file mode 100644 index 1d3c64f620..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | |||
| 2 | Section "Files" | ||
| 3 | EndSection | ||
| 4 | |||
| 5 | Section "Device" | ||
| 6 | Identifier "Graphics Controller" | ||
| 7 | Driver "fbdev" | ||
| 8 | EndSection | ||
| 9 | |||
| 10 | Section "Monitor" | ||
| 11 | Identifier "Generic Monitor" | ||
| 12 | Option "DPMS" | ||
| 13 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
| 14 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
| 15 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
| 16 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
| 17 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
| 18 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
| 19 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
| 20 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
| 21 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
| 22 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
| 23 | EndSection | ||
| 24 | |||
| 25 | Section "Screen" | ||
| 26 | Identifier "Default Screen" | ||
| 27 | Device "Graphics Controller" | ||
| 28 | Monitor "Generic Monitor" | ||
| 29 | DefaultDepth 16 | ||
| 30 | SubSection "Display" | ||
| 31 | Modes "640x480" | ||
| 32 | EndSubSection | ||
| 33 | EndSection | ||
| 34 | |||
| 35 | Section "ServerLayout" | ||
| 36 | Identifier "Default Layout" | ||
| 37 | Screen "Default Screen" | ||
| 38 | Option "AllowEmptyInput" "no" | ||
| 39 | EndSection | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf deleted file mode 100644 index 03b94dc3af..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | |||
| 2 | Section "Files" | ||
| 3 | EndSection | ||
| 4 | |||
| 5 | Section "Device" | ||
| 6 | Identifier "Graphics Controller" | ||
| 7 | Driver "fbdev" | ||
| 8 | EndSection | ||
| 9 | |||
| 10 | Section "Monitor" | ||
| 11 | Identifier "Generic Monitor" | ||
| 12 | Option "DPMS" | ||
| 13 | # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz | ||
| 14 | Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync | ||
| 15 | # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz | ||
| 16 | ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync | ||
| 17 | # 640x480 @ 72Hz (VESA) hsync: 37.9kHz | ||
| 18 | ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync | ||
| 19 | # 640x480 @ 75Hz (VESA) hsync: 37.5kHz | ||
| 20 | ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync | ||
| 21 | # 640x480 @ 85Hz (VESA) hsync: 43.3kHz | ||
| 22 | ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync | ||
| 23 | EndSection | ||
| 24 | |||
| 25 | Section "Screen" | ||
| 26 | Identifier "Default Screen" | ||
| 27 | Device "Graphics Controller" | ||
| 28 | Monitor "Generic Monitor" | ||
| 29 | DefaultDepth 16 | ||
| 30 | SubSection "Display" | ||
| 31 | Modes "640x480" | ||
| 32 | EndSubSection | ||
| 33 | EndSection | ||
| 34 | |||
| 35 | Section "ServerLayout" | ||
| 36 | Identifier "Default Layout" | ||
| 37 | Screen "Default Screen" | ||
| 38 | Option "AllowEmptyInput" "no" | ||
| 39 | EndSection | ||