From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 06/13] qemumips: use std vga instead of cirrus vga
Date: Wed, 19 Feb 2020 20:47:45 +0100 [thread overview]
Message-ID: <20200219194752.7967-6-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com>
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.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/machine/include/qemuboot-mips.inc | 2 +-
.../xserver-xf86-config/qemumips/xorg.conf | 39 -------------------
.../xserver-xf86-config/qemumips64/xorg.conf | 39 -------------------
3 files changed, 1 insertion(+), 79 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
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"
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
# For graphics to work we need to define the VGA device as well as the necessary USB devices
-QB_OPT_APPEND += "-device cirrus-vga"
+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 @@
-
-Section "Files"
-EndSection
-
-Section "Device"
- Identifier "Graphics Controller"
- Driver "fbdev"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
- # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
- Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
- # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
- ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
- # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
- ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
- # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
- ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
- # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
- ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Graphics Controller"
- Monitor "Generic Monitor"
- DefaultDepth 16
- SubSection "Display"
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- Option "AllowEmptyInput" "no"
-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 @@
-
-Section "Files"
-EndSection
-
-Section "Device"
- Identifier "Graphics Controller"
- Driver "fbdev"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
- # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
- Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
- # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
- ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
- # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
- ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
- # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
- ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
- # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
- ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Graphics Controller"
- Monitor "Generic Monitor"
- DefaultDepth 16
- SubSection "Display"
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- Option "AllowEmptyInput" "no"
-EndSection
--
2.25.0
next prev parent reply other threads:[~2020-02-19 19:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-19 19:47 ` [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
2020-02-23 13:02 ` Adrian Bunk
2020-02-23 13:05 ` Alexander Kanavin
2020-02-23 14:38 ` Adrian Bunk
2020-02-19 19:47 ` [PATCH 03/13] webkitgtk: unbreak wayland build Alexander Kanavin
2020-02-19 23:52 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 04/13] wayland: convert to meson build Alexander Kanavin
2020-02-20 16:21 ` Joshua Watt
2020-02-20 16:38 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines Alexander Kanavin
2020-03-12 20:54 ` Khem Raj
2020-02-19 19:47 ` Alexander Kanavin [this message]
2020-02-19 19:47 ` [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Alexander Kanavin
2020-02-20 10:26 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200219194752.7967-6-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.