resolve Xorg server DCP display issue (#2152414)

Xorg server does not correctly select the DCP for the display without a quirk

0001-add-a-quirk-for-apple-silicon.patch

@@ -0,0 +1,30 @@
+commit 39934a656a44722d16a80bf4db411c53e2d67b38 (HEAD -> master, origin/master, origin/HEAD)
+Author: Eric Curtin <ecurtin@redhat.com>
+Date:   Fri Dec 16 11:10:12 2022 +0000
+
+    config: add a quirk for Apple Silicon appledrm
+    
+    Xorg server does not correctly select the DCP for the display without a
+    quirk on Apple Silicon.
+    
+    Signed-off-by: Eric Curtin <ecurtin@redhat.com>
+    Suggested-by: Hector Martin <marcan@marcan.st>
+
+diff --git a/config/10-quirks.conf b/config/10-quirks.conf
+index 47907d82d..54dd908a7 100644
+--- a/config/10-quirks.conf
++++ b/config/10-quirks.conf
+@@ -36,3 +36,13 @@ Section "InputClass"
+         MatchDriver "evdev"
+         Option "TypeName" "MOUSE"
+ EndSection
++
++# https://bugzilla.redhat.com/show_bug.cgi?id=2152414
++# Xorg server does not correctly select the DCP for the display without
++# a quirk on Apple Silicon
++Section "OutputClass"
++        Identifier "appledrm"
++        MatchDriver "apple"
++        Driver "modesetting"
++        Option "PrimaryGPU" "true"
++EndSection

10-quirks.conf

@@ -1,38 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=523914
-# Mouse does not move in PV Xen guest
-# Explicitly tell evdev to not ignore the absolute axes.
-Section "InputClass"
-        Identifier "Xen Virtual Pointer axis blacklist"
-        MatchProduct "Xen Virtual Pointer"
-        Option "IgnoreAbsoluteAxes" "off"
-        Option "IgnoreRelativeAxes" "off"
-EndSection
-
-# https://bugs.freedesktop.org/show_bug.cgi?id=55867
-# Bug 55867 - Doesn't know how to tag XI_TRACKBALL
-Section "InputClass"
-        Identifier "Tag trackballs as XI_TRACKBALL"
-        MatchProduct "trackball"
-        MatchDriver "evdev"
-        Option "TypeName" "TRACKBALL"
-EndSection
-
-# https://bugs.freedesktop.org/show_bug.cgi?id=62831
-# Bug 62831 - Mionix Naos 5000 mouse detected incorrectly
-Section "InputClass"
-        Identifier "Tag Mionix Naos 5000 mouse XI_MOUSE"
-        MatchProduct "La-VIEW Technology Naos 5000 Mouse"
-        MatchDriver "evdev"
-        Option "TypeName" "MOUSE"
-EndSection

xorg-x11-server.spec

@@ -46,7 +46,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.20.14
-Release:   14%{?gitdate:.%{gitdate}}%{?dist}
+Release:   15%{?gitdate:.%{gitdate}}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 
@@ -63,8 +63,6 @@ Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
 Source1:   gitignore
 %endif
 
-Source4:   10-quirks.conf
-
 Source10:   xserver.pamd
 
 # "useful" xvfb-run script
@@ -107,6 +105,7 @@ Patch101: 0001-render-Fix-build-with-gcc-12.patch
 Patch102: 0001-xf86-Accept-devices-with-the-simpledrm-driver.patch
 Patch103: 0001-Don-t-hardcode-fps-for-fake-screen.patch
 Patch104: 0001-hw-Rename-boolean-config-value-field-from-bool-to-bo.patch
+Patch105: 0001-add-a-quirk-for-apple-silicon.patch
 
 # CVE-2022-2319/ZDI-CAN-16062, CVE-2022-2320/ZDI-CAN-16070
 Patch110: 0001-xkb-switch-to-array-index-loops-to-moving-pointers.patch
@@ -408,9 +407,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
-
 # make sure the (empty) /etc/X11/xorg.conf.d is there, system-setup-keyboard
 # relies on it more or less.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
@@ -554,6 +550,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Fri Jan 13 2023 Leif Liddy <leifliddy@fedoraproject.org> 1.20.14-15
+- Xorg server does not correctly select the DCP for the display
+  without a quirk on Apple silicon machines (#2152414)
+
 * Fri Jan 13 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.20.14-14
 - Disallow byte-swapped clients (#2159489)