xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

 config/10-quirks.conf |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit c3144adcbc01d4f9f4d1e42323fc51be689bee17
Author: Eric Curtin <ecurtin at 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 at redhat.com>
    Suggested-by: Hector Martin <marcan at marcan.st>
    (cherry picked from commit 39934a656a44722d16a80bf4db411c53e2d67b38)
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1746>

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