summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2025-03-11 11:22:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-11 21:29:50 +0000
commit422362a03a690780dc037165eacdda449bcfbe71 (patch)
tree363c9aaf1156cc84897ea7bf1434651ec2987f24 /meta
parent6385714277fb5c0447a846d2ba9c94b693a02ea1 (diff)
downloadpoky-422362a03a690780dc037165eacdda449bcfbe71.tar.gz
xserver-xf86-config: remove obsolete configuration files
For reasons we have explicit xorg.conf files for a number of the qemu machines, but not all of them. These mainly disabled screen blanking (which is now down with a separate fragment) but also explictly set the device driver to fbdev which meant they didn't use the modesettings driver as they should (with the virtio framebuffer from qemu). This is the root cause of why the xserver 21.1.16 upgrade doesn't work on a number of machines: the /sys probing changed and the fbdev driver now refuses to use the PCI framebuffer device as there are better drivers, but we've explictly told xorg to use the wrong driver. For more details, see https://gitlab.freedesktop.org/xorg/xserver/-/issues/1798. (From OE-Core rev: 8c8039bf4c2d011e3d12c970ce45036b184902a9) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf42
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf42
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf42
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf37
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf37
5 files changed, 0 insertions, 200 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
deleted file mode 100644
index 3eb380a0a4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1
2Section "Files"
3EndSection
4
5Section "Device"
6 Identifier "Graphics Controller"
7 Driver "fbdev"
8EndSection
9
10Section "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
23EndSection
24
25Section "Screen"
26 Identifier "Default Screen"
27 Device "Graphics Controller"
28 Monitor "Generic Monitor"
29 SubSection "Display"
30 Modes "640x480"
31 EndSubSection
32EndSection
33
34Section "ServerLayout"
35 Identifier "Default Layout"
36 Screen "Default Screen"
37 Option "AllowEmptyInput" "no"
38 Option "BlankTime" "0"
39 Option "StandbyTime" "0"
40 Option "SuspendTime" "0"
41 Option "OffTime" "0"
42EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
deleted file mode 100644
index 3eb380a0a4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1
2Section "Files"
3EndSection
4
5Section "Device"
6 Identifier "Graphics Controller"
7 Driver "fbdev"
8EndSection
9
10Section "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
23EndSection
24
25Section "Screen"
26 Identifier "Default Screen"
27 Device "Graphics Controller"
28 Monitor "Generic Monitor"
29 SubSection "Display"
30 Modes "640x480"
31 EndSubSection
32EndSection
33
34Section "ServerLayout"
35 Identifier "Default Layout"
36 Screen "Default Screen"
37 Option "AllowEmptyInput" "no"
38 Option "BlankTime" "0"
39 Option "StandbyTime" "0"
40 Option "SuspendTime" "0"
41 Option "OffTime" "0"
42EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
deleted file mode 100644
index 3eb380a0a4..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
+++ /dev/null
@@ -1,42 +0,0 @@
1
2Section "Files"
3EndSection
4
5Section "Device"
6 Identifier "Graphics Controller"
7 Driver "fbdev"
8EndSection
9
10Section "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
23EndSection
24
25Section "Screen"
26 Identifier "Default Screen"
27 Device "Graphics Controller"
28 Monitor "Generic Monitor"
29 SubSection "Display"
30 Modes "640x480"
31 EndSubSection
32EndSection
33
34Section "ServerLayout"
35 Identifier "Default Layout"
36 Screen "Default Screen"
37 Option "AllowEmptyInput" "no"
38 Option "BlankTime" "0"
39 Option "StandbyTime" "0"
40 Option "SuspendTime" "0"
41 Option "OffTime" "0"
42EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
deleted file mode 100644
index c01c3331c5..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
+++ /dev/null
@@ -1,37 +0,0 @@
1
2Section "Files"
3EndSection
4
5Section "Monitor"
6 Identifier "Generic Monitor"
7 Option "DPMS"
8 # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
9 Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
10 # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
11 ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
12 # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
13 ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
14 # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
15 ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
16 # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
17 ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
18EndSection
19
20Section "Screen"
21 Identifier "Default Screen"
22 Device "Graphics Controller"
23 Monitor "Generic Monitor"
24 SubSection "Display"
25 Modes "640x480"
26 EndSubSection
27EndSection
28
29Section "ServerLayout"
30 Identifier "Default Layout"
31 Screen "Default Screen"
32 Option "AllowEmptyInput" "no"
33 Option "BlankTime" "0"
34 Option "StandbyTime" "0"
35 Option "SuspendTime" "0"
36 Option "OffTime" "0"
37EndSection
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
deleted file mode 100644
index c01c3331c5..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
+++ /dev/null
@@ -1,37 +0,0 @@
1
2Section "Files"
3EndSection
4
5Section "Monitor"
6 Identifier "Generic Monitor"
7 Option "DPMS"
8 # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
9 Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
10 # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
11 ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
12 # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
13 ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
14 # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
15 ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
16 # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
17 ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
18EndSection
19
20Section "Screen"
21 Identifier "Default Screen"
22 Device "Graphics Controller"
23 Monitor "Generic Monitor"
24 SubSection "Display"
25 Modes "640x480"
26 EndSubSection
27EndSection
28
29Section "ServerLayout"
30 Identifier "Default Layout"
31 Screen "Default Screen"
32 Option "AllowEmptyInput" "no"
33 Option "BlankTime" "0"
34 Option "StandbyTime" "0"
35 Option "SuspendTime" "0"
36 Option "OffTime" "0"
37EndSection
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-01 11:37:37 +0000