Update to v21.1.21

Resolves: #2417000

.gitignore

@@ -1,36 +1,3 @@
-xorg-server-1.9.1.tar.bz2
-/xorg-server-20101125.tar.xz
-/xorg-server-20101201.tar.xz
-/xorg-server-1.10.0.tar.bz2
-/xorg-server-20110418.tar.xz
-/xorg-server-20110510.tar.xz
-/xorg-server-20110818.tar.xz
-/xorg-server-1.11.0.tar.bz2
-/xorg-server-1.11.1.tar.bz2
-/xorg-server-20111109.tar.xz
-/xorg-server-20120103.tar.xz
-/xorg-server-20120124.tar.xz
-/xorg-server-20120215.tar.xz
-/xorg-server-1.12.0.tar.bz2
-/xorg-server-1.12.1.tar.bz2
-/xorg-server-1.12.2.tar.bz2
-/xorg-server-1.12.3.tar.bz2
-/xorg-server-20120717.tar.xz
-/xorg-server-20120726.tar.xz
-/xorg-server-20120808.tar.xz
-/xorg-server-20120822.tar.xz
-/xorg-server-1.13.0.tar.bz2
-/xorg-server-1.13.1.tar.bz2
-/xorg-server-20130109.tar.xz
-/xorg-server-20130215.tar.xz
-/xorg-server-1.14.0.tar.bz2
-/xorg-server-1.14.1.tar.bz2
-/xorg-server-1.14.1.901.tar.bz2
-/xorg-server-1.14.2.tar.bz2
-/xorg-server-1.14.3.tar.bz2
-/xorg-server-1.14.99.3.tar.bz2
-/xorg-server-1.14.99.901.tar.bz2
-/xorg-server-1.14.99.902.tar.bz2
 *.bz2
 *.xz
-/xorg-x11-server-1.15.0-1.fc21.src.rpm
+*.gz

0001-Xi-return-AlreadyGrabbed-for-key-grabs-255.patch

@@ -1,42 +0,0 @@
-From 0ad717edcf372425ddf2ba9926857419ab62f4f5 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 29 May 2019 16:19:55 +1000
-Subject: [PATCH xserver] Xi: return AlreadyGrabbed for key grabs > 255
-
-We can't have high keycodes because everything in XKB relies on 8 bits. XI2's
-API allows for 32-bit keycodes so we have to take those but nothing in the
-server is really ready for this. The effect of this right now is that any high
-keycode grab is clipped to 255 and thus ends up grabbing a different key
-instead.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1697804
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- Xi/xipassivegrab.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
-index 65d5870f6..d30f51f3c 100644
---- a/Xi/xipassivegrab.c
-+++ b/Xi/xipassivegrab.c
-@@ -203,8 +203,14 @@ ProcXIPassiveGrabDevice(ClientPtr client)
-                                 &param, XI2, &mask);
-             break;
-         case XIGrabtypeKeycode:
--            status = GrabKey(client, dev, mod_dev, stuff->detail,
--                             &param, XI2, &mask);
-+            /* XI2 allows 32-bit keycodes but thanks to XKB we can never
-+             * implement this. Just return an error for all keycodes that
-+             * cannot work anyway */
-+            if (stuff->detail > 255)
-+                status = XIAlreadyGrabbed;
-+            else
-+                status = GrabKey(client, dev, mod_dev, stuff->detail,
-+                                 &param, XI2, &mask);
-             break;
-         case XIGrabtypeEnter:
-         case XIGrabtypeFocusIn:
--- 
-2.21.0
-

0001-autobind-GPUs-to-the-screen.patch

@@ -1,293 +0,0 @@
-From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 2 Apr 2018 16:49:02 -0400
-Subject: [PATCH] autobind GPUs to the screen
-
-This is a modified version of a patch we've been carry-ing in Fedora and
-RHEL for years now. This patch automatically adds secondary GPUs to the
-master as output sink / offload source making e.g. the use of
-slave-outputs just work, with requiring the user to manually run
-"xrandr --setprovideroutputsource" before he can hookup an external
-monitor to his hybrid graphics laptop.
-
-There is one problem with this patch, which is why it was not upstreamed
-before. What to do when a secondary GPU gets detected really is a policy
-decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
-as such should be under control of the Desktop Environment.
-
-Unconditionally adding autobinding support to the xserver will result
-in races between the DE dealing with the hotplug of a secondary GPU
-and the server itself dealing with it.
-
-However we've waited for years for any Desktop Environments to actually
-start doing some sort of autoconfiguration of secondary GPUs and there
-is still not a single DE dealing with this, so I believe that it is
-time to upstream this now.
-
-To avoid potential future problems if any DEs get support for doing
-secondary GPU configuration themselves, the new autobind functionality
-is made optional. Since no DEs currently support doing this themselves it
-is enabled by default. When DEs grow support for doing this themselves
-they can disable the servers autobinding through the servers cmdline or a
-xorg.conf snippet.
-
-Signed-off-by: Dave Airlie <airlied@gmail.com>
-[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- hw/xfree86/common/xf86Config.c      | 19 +++++++++++++++++++
- hw/xfree86/common/xf86Globals.c     |  2 ++
- hw/xfree86/common/xf86Init.c        | 20 ++++++++++++++++++++
- hw/xfree86/common/xf86Priv.h        |  1 +
- hw/xfree86/common/xf86Privstr.h     |  1 +
- hw/xfree86/common/xf86platformBus.c |  4 ++++
- hw/xfree86/man/Xorg.man             |  7 +++++++
- hw/xfree86/man/xorg.conf.man        |  6 ++++++
- randr/randrstr.h                    |  3 +++
- randr/rrprovider.c                  | 22 ++++++++++++++++++++++
- 10 files changed, 85 insertions(+)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 2c1d335..d7d7c2e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -643,6 +643,7 @@ typedef enum {
-     FLAG_DRI2,
-     FLAG_USE_SIGIO,
-     FLAG_AUTO_ADD_GPU,
-+    FLAG_AUTO_BIND_GPU,
-     FLAG_MAX_CLIENTS,
-     FLAG_IGLX,
-     FLAG_DEBUG,
-@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = {
-      {0}, FALSE},
-     {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN,
-      {0}, FALSE},
-+    {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN,
-+     {0}, FALSE},
-     {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER,
-      {0}, FALSE },
-     {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN,
-@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
-     }
-     xf86Msg(from, "%sutomatically adding GPU devices\n",
-             xf86Info.autoAddGPU ? "A" : "Not a");
-+
-+    if (xf86AutoBindGPUDisabled) {
-+        xf86Info.autoBindGPU = FALSE;
-+        from = X_CMDLINE;
-+    }
-+    else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) {
-+        xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU,
-+                          &xf86Info.autoBindGPU);
-+        from = X_CONFIG;
-+    }
-+    else {
-+        from = X_DEFAULT;
-+    }
-+    xf86Msg(from, "%sutomatically binding GPU devices\n",
-+            xf86Info.autoBindGPU ? "A" : "Not a");
-+
-     /*
-      * Set things up based on the config file information.  Some of these
-      * settings may be overridden later when the command line options are
-diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index e890f05..7b27b4c 100644
---- a/hw/xfree86/common/xf86Globals.c
-+++ b/hw/xfree86/common/xf86Globals.c
-@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = {
- #else
-     .autoAddGPU = FALSE,
- #endif
-+    .autoBindGPU = TRUE,
- };
- 
- const char *xf86ConfigFile = NULL;
-@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE;
- Gamma xf86Gamma = { 0.0, 0.0, 0.0 };
- 
- Bool xf86AllowMouseOpenFail = FALSE;
-+Bool xf86AutoBindGPUDisabled = FALSE;
- 
- #ifdef XF86VIDMODE
- Bool xf86VidModeDisabled = FALSE;
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index ea42ec9..ec255b6 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -76,6 +76,7 @@
- #include "xf86DDC.h"
- #include "xf86Xinput.h"
- #include "xf86InPriv.h"
-+#include "xf86Crtc.h"
- #include "picturestr.h"
- #include "randrstr.h"
- #include "glxvndabi.h"
-@@ -237,6 +238,19 @@ xf86PrivsElevated(void)
-     return PrivsElevated();
- }
- 
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    if (!xf86Info.autoBindGPU)
-+        return;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                      xf86ScrnToScreen(xf86Screens[0]));
-+}
-+
- static void
- TrapSignals(void)
- {
-@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         input_unlock();
-@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i)
-         xf86Info.iglxFrom = X_CMDLINE;
-         return 0;
-     }
-+    if (!strcmp(argv[i], "-noautoBindGPU")) {
-+        xf86AutoBindGPUDisabled = TRUE;
-+        return 1;
-+    }
- 
-     /* OS-specific processing */
-     return xf86ProcessArgument(argc, argv, i);
-diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
-index 4fe2b5f..6566622 100644
---- a/hw/xfree86/common/xf86Priv.h
-+++ b/hw/xfree86/common/xf86Priv.h
-@@ -46,6 +46,7 @@
- extern _X_EXPORT const char *xf86ConfigFile;
- extern _X_EXPORT const char *xf86ConfigDir;
- extern _X_EXPORT Bool xf86AllowMouseOpenFail;
-+extern _X_EXPORT Bool xf86AutoBindGPUDisabled;
- 
- #ifdef XF86VIDMODE
- extern _X_EXPORT Bool xf86VidModeDisabled;
-diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
-index 21c2e1f..6c71863 100644
---- a/hw/xfree86/common/xf86Privstr.h
-+++ b/hw/xfree86/common/xf86Privstr.h
-@@ -98,6 +98,7 @@ typedef struct {
- 
-     Bool autoAddGPU;
-     const char *debug;
-+    Bool autoBindGPU;
- } xf86InfoRec, *xf86InfoPtr;
- 
- /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index cef47da..913a324 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -49,6 +49,7 @@
- #include "Pci.h"
- #include "xf86platformBus.h"
- #include "xf86Config.h"
-+#include "xf86Crtc.h"
- 
- #include "randrstr.h"
- int platformSlotClaimed;
-@@ -665,6 +666,9 @@ xf86platformAddDevice(int index)
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   if (xf86Info.autoBindGPU)
-+       RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]),
-+                                     xf86ScrnToScreen(xf86Screens[0]));
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
-index 13a9dc3..745f986 100644
---- a/hw/xfree86/man/Xorg.man
-+++ b/hw/xfree86/man/Xorg.man
-@@ -283,6 +283,13 @@ is a comma separated list of directories to search for
- server modules.  This option is only available when the server is run
- as root (i.e, with real-uid 0).
- .TP 8
-+.B \-noautoBindGPU
-+Disable automatically setting secondary GPUs up as output sinks and offload
-+sources. This is equivalent to setting the
-+.B AutoBindGPU
-+xorg.conf(__filemansuffix__) file option. To
-+.B false.
-+.TP 8
- .B \-nosilk
- Disable Silken Mouse support.
- .TP 8
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index 9589262..8d51e06 100644
---- a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -672,6 +672,12 @@ Enabled by default.
- If this option is disabled, then no GPU devices will be added from the udev
- backend. Enabled by default. (May need to be disabled to setup Xinerama).
- .TP 7
-+.BI "Option \*qAutoBindGPU\*q  \*q" boolean \*q
-+If enabled then secondary GPUs will be automatically set up as output-sinks and
-+offload-sources. Making e.g. laptop outputs connected only to the secondary
-+GPU directly available for use without needing to run
-+"xrandr --setprovideroutputsource". Enabled by default.
-+.TP 7
- .BI "Option \*qLog\*q \*q" string \*q
- This option controls whether the log is flushed and/or synced to disk after
- each message.
-diff --git a/randr/randrstr.h b/randr/randrstr.h
-index f94174b..092d726 100644
---- a/randr/randrstr.h
-+++ b/randr/randrstr.h
-@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p);
- extern _X_EXPORT void
- RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider);
- 
-+extern _X_EXPORT void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen);
-+
- /* rrproviderproperty.c */
- 
- extern _X_EXPORT void
-diff --git a/randr/rrprovider.c b/randr/rrprovider.c
-index e4bc2bf..e04c18f 100644
---- a/randr/rrprovider.c
-+++ b/randr/rrprovider.c
-@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider)
- 
-     WriteEventsToClient(client, 1, (xEvent *) &pe);
- }
-+
-+void
-+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen);
-+    RRProviderPtr provider = pScrPriv->provider;
-+    RRProviderPtr master_provider = masterPriv->provider;
-+
-+    if (!provider || !master_provider)
-+        return;
-+
-+    if ((provider->capabilities & RR_Capability_SinkOutput) &&
-+        (master_provider->capabilities & RR_Capability_SourceOutput)) {
-+        pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider);
-+        RRInitPrimeSyncProps(pScreen);
-+    }
-+
-+    if ((provider->capabilities & RR_Capability_SourceOffload) &&
-+        (master_provider->capabilities & RR_Capability_SinkOffload))
-+        pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider);
-+}
--- 
-2.16.2
-

0001-dix-leave-last.valuators-alone-on-slave-switch.patch

@@ -1,89 +0,0 @@
-From 13f9b07039484927532d913dbccc664679235bf6 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 25 Mar 2019 13:19:41 +1000
-Subject: [PATCH xserver] dix: leave last.valuators alone on slave switch
-
-Terms:
-dev->last.valuator[] is the last value given to us by the driver
-dev->valuator.axisVal[] is the last value sent to the client
-dev->last.scroll[] is the abs value of the scroll axis as given by the driver,
-        used for button emulation calculation (and the remainder)
-
-This function updates the device's last.valuator state based on the current
-master axis state. This way, relative motion continues fluidly when switching
-between devices. Before mouse 2 comes into effect, it's valuator state is
-updated to wherever the pointer currently is so the relative event applies on
-top of that.
-
-This can only work for x/y axes, all other axes aren't guaranteed to have the
-same meaning and/or may not be present:
-- xtest device: no valuator 2
-- mouse: valuator 2 is horizontal scroll axis
-- tablet: valuator 2 is pressure
-
-Scaling the current value from the pressure range into the range for
-horizontal scrolling makes no sense. And it causes scroll jumps:
-
-- scroll down, last.valuator == axisVal == 20
-- xdotool click 1, the XTest device doesn't have that valuator
-- scroll up
-  - updateSlaveDeviceCoords reset last.valuator to 0 (axisVal == 20)
-  - DeviceClassesChangedEvent includes value 20 for the axis
-  - event is processed, last.value changes from 0 to -1
-  - axisVal is updated to -1, causing a jump of -21
-
-The same applies when we switch from tablet to mouse wheel if the pressure
-value is 0 on proximity out (basically guaranteed). So let's drop this code
-altogether and only leave the scaling for the relative x/y motion.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/getevents.c | 25 +------------------------
- 1 file changed, 1 insertion(+), 24 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index d8955969a..f83dac709 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -331,9 +331,6 @@ rescaleValuatorAxis(double coord, AxisInfoPtr from, AxisInfoPtr to,
- static void
- updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
- {
--    int i;
--    DeviceIntPtr lastSlave;
--
-     /* master->last.valuators[0]/[1] is in desktop-wide coords and the actual
-      * position of the pointer */
-     pDev->last.valuators[0] = master->last.valuators[0];
-@@ -358,27 +355,7 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
-                                                       screenInfo.height);
-     }
- 
--    /* calculate the other axis as well based on info from the old
--     * slave-device. If the old slave had less axes than this one,
--     * last.valuators is reset to 0.
--     */
--    if ((lastSlave = master->last.slave) && lastSlave->valuator) {
--        for (i = 2; i < pDev->valuator->numAxes; i++) {
--            if (i >= lastSlave->valuator->numAxes) {
--                pDev->last.valuators[i] = 0;
--                valuator_mask_set_double(pDev->last.scroll, i, 0);
--            }
--            else {
--                double val = pDev->last.valuators[i];
--
--                val = rescaleValuatorAxis(val, lastSlave->valuator->axes + i,
--                                          pDev->valuator->axes + i, 0, 0);
--                pDev->last.valuators[i] = val;
--                valuator_mask_set_double(pDev->last.scroll, i, val);
--            }
--        }
--    }
--
-+    /* other axes are left as-is */
- }
- 
- /**
--- 
-2.20.1
-

0001-modesetting-Weaksauce-atomic-property-debugging.patch

@@ -1,64 +0,0 @@
-From 6915752b2da77c29bf8c861a6d4f2383e667323b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 5 Oct 2018 14:07:46 -0400
-Subject: [PATCH xserver 1/4] modesetting: Weaksauce atomic property debugging
-
-This would be a good idea to have around for troubleshooting purposes,
-but this particular patch is Not Good.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- hw/xfree86/drivers/modesetting/drmmode_display.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index cb48aa46b..a8d989a24 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -415,6 +415,13 @@ drmmode_ConvertToKMode(ScrnInfoPtr scrn,
-                        drmModeModeInfo * kmode, DisplayModePtr mode);
- 
- 
-+static int
-+drmmodeatomicaddproperty(drmModeAtomicReqPtr req, uint32_t obj, uint32_t prop, uint64_t value)
-+{
-+    ErrorF("Adding to %p: %x %x %lx\n", req, obj, prop, value);
-+    return drmModeAtomicAddProperty(req, obj, prop, value);
-+}
-+
- static int
- plane_add_prop(drmModeAtomicReq *req, drmmode_crtc_private_ptr drmmode_crtc,
-                enum drmmode_plane_property prop, uint64_t val)
-@@ -425,7 +432,8 @@ plane_add_prop(drmModeAtomicReq *req, drmmode_crtc_private_ptr drmmode_crtc,
-     if (!info)
-         return -1;
- 
--    ret = drmModeAtomicAddProperty(req, drmmode_crtc->plane_id,
-+    ErrorF("Setting %s\n", info->name);
-+    ret = drmmodeatomicaddproperty(req, drmmode_crtc->plane_id,
-                                    info->prop_id, val);
-     return (ret <= 0) ? -1 : 0;
- }
-@@ -467,7 +475,8 @@ crtc_add_prop(drmModeAtomicReq *req, drmmode_crtc_private_ptr drmmode_crtc,
-     if (!info)
-         return -1;
- 
--    ret = drmModeAtomicAddProperty(req, drmmode_crtc->mode_crtc->crtc_id,
-+    ErrorF("Setting %s\n", info->name);
-+    ret = drmmodeatomicaddproperty(req, drmmode_crtc->mode_crtc->crtc_id,
-                                    info->prop_id, val);
-     return (ret <= 0) ? -1 : 0;
- }
-@@ -482,7 +491,8 @@ connector_add_prop(drmModeAtomicReq *req, drmmode_output_private_ptr drmmode_out
-     if (!info)
-         return -1;
- 
--    ret = drmModeAtomicAddProperty(req, drmmode_output->output_id,
-+    ErrorF("Setting %s\n", info->name);
-+    ret = drmmodeatomicaddproperty(req, drmmode_output->output_id,
-                                    info->prop_id, val);
-     return (ret <= 0) ? -1 : 0;
- }
--- 
-2.20.1
-

0001-xf86-dri2-Use-va_gl-as-vdpau_driver-for-Intel-i965-G.patch

@@ -52,7 +52,7 @@ index 6619e3aa7..1f8ad14bc 100644
      /* For non-PCI devices and drmGetDevice fail, just assume that
       * the 3D driver is named the same as the kernel driver. This is
       * currently true for vc4 and msm (freedreno).
-@@ -1456,12 +1460,14 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
+@@ -1454,12 +1458,14 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
              xf86DrvMsg(pScreen->myNum, X_ERROR,
                         "[DRI2] Couldn't drmGetVersion() on non-PCI device, "
                         "no driver name found.\n");
@@ -70,7 +70,7 @@ index 6619e3aa7..1f8ad14bc 100644
      }
  
      for (i = 0; driver_map[i].driver; i++) {
-@@ -1469,13 +1475,15 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
+@@ -1467,13 +1473,15 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
              continue;
  
          if (driver_map[i].num_chips_ids == -1) {
@@ -88,7 +88,7 @@ index 6619e3aa7..1f8ad14bc 100644
                  goto out;
              }
          }
-@@ -1487,9 +1495,9 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
+@@ -1485,9 +1493,9 @@ dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info)
                 dev->deviceinfo.pci->vendor_id, dev->deviceinfo.pci->device_id);
  out:
      drmFreeDevice(&dev);
@@ -100,21 +100,21 @@ index 6619e3aa7..1f8ad14bc 100644
  #endif
  }
  
-@@ -1610,7 +1618,8 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
-         if (info->driverName) {
-             ds->driverNames[0] = info->driverName;
+@@ -1604,7 +1612,8 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
          } else {
+             /* FIXME dri2_probe_driver_name() returns a strdup-ed string,
+              * currently this gets leaked */
 -            ds->driverNames[0] = ds->driverNames[1] = dri2_probe_driver_name(pScreen, info);
 +            dri2_probe_driver_name(pScreen, info,
 +                                   &ds->driverNames[0], &ds->driverNames[1]);
              if (!ds->driverNames[0])
                  return FALSE;
-         }
+ 
 diff --git a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
 index da7ea1c1e..7036d1003 100644
 --- a/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
 +++ b/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h
-@@ -66,21 +66,22 @@ static const int vmwgfx_chip_ids[] = {
+@@ -60,23 +60,24 @@ static const int vmwgfx_chip_ids[] = {
  static const struct {
     int vendor_id;
     const char *driver;
@@ -124,8 +124,10 @@ index da7ea1c1e..7036d1003 100644
  } driver_map[] = {
 -   { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
 -   { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
+-   { 0x8086, "i965", NULL, -1 },
 +   { 0x8086, "i915", "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
 +   { 0x8086, "i965", "va_gl", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) },
++   { 0x8086, "i965", "va_gl", NULL, -1 },
  #ifndef DRIVER_MAP_GALLIUM_ONLY
 -   { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) },
 -   { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) },
@@ -134,19 +136,18 @@ index da7ea1c1e..7036d1003 100644
  #endif
 -   { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
 -   { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
--   { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) },
+-   { 0x1002, "radeonsi", NULL, -1 },
 -   { 0x10de, "nouveau", NULL, -1 },
 -   { 0x1af4, "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
 -   { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
+-   { 0x0000, NULL, NULL, 0 },
 +   { 0x1002, "r300", "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) },
-+   { 0x1002, "r600","r600",  r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
-+   { 0x1002, "radeonsi", "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) },
++   { 0x1002, "r600", "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) },
++   { 0x1002, "radeonsi", "radeonsi", NULL, -1 },
 +   { 0x10de, "nouveau", "nouveau", NULL, -1 },
 +   { 0x1af4, "virtio_gpu", "virtio_gpu", virtio_gpu_chip_ids, ARRAY_SIZE(virtio_gpu_chip_ids) },
 +   { 0x15ad, "vmwgfx", "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) },
-    { 0x0000, NULL, NULL, 0 },
++   { 0x0000, NULL, NULL, NULL, 0 },
  };
  
--- 
-2.19.0
-
+ #endif /* _PCI_ID_DRIVER_MAP_H_ */

0001-xwayland-present-Destroy-sync_callback-in-xwl_presen.patch

@@ -1,36 +0,0 @@
-From 2e18eec6f03cc4d9d5bf62853c65d341b363f4b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
-Date: Fri, 8 Mar 2019 18:49:04 +0100
-Subject: [PATCH xserver] xwayland/present: Destroy sync_callback in
- xwl_present_cleanup
-
-xwl_present_cleanup frees the struct xwl_present_window memory,
-so if there's a pending callback, we have to destroy it to prevent
-use-after-free in xwl_present_sync_callback.
-
-Should fix issue #645.
-
-Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
----
- hw/xwayland/xwayland-present.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/hw/xwayland/xwayland-present.c b/hw/xwayland/xwayland-present.c
-index 192f59a653..a1b3109cc2 100644
---- a/hw/xwayland/xwayland-present.c
-+++ b/hw/xwayland/xwayland-present.c
-@@ -123,6 +123,11 @@ xwl_present_cleanup(WindowPtr window)
-         xwl_present_window->frame_callback = NULL;
-     }
- 
-+    if (xwl_present_window->sync_callback) {
-+        wl_callback_destroy(xwl_present_window->sync_callback);
-+        xwl_present_window->sync_callback = NULL;
-+    }
-+
-     /* Clear remaining events */
-     xorg_list_for_each_entry_safe(event, tmp, &xwl_present_window->event_list, list) {
-         xorg_list_del(&event->list);
--- 
-2.20.1
-

0002-modesetting-Propagate-more-failure-in-drmmode_set_mo.patch

@@ -1,31 +0,0 @@
-From e262c8ae0039710422c11ae254ddb4ae7e6fac02 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 5 Oct 2018 14:03:54 -0400
-Subject: [PATCH xserver 2/4] modesetting: Propagate more failure in
- drmmode_set_mode_major
-
-It's possible that actually setting the mode would fail even though the
-check succeeded. We would throw away the error in this case, which would
-probably make recovery a bit difficult.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- hw/xfree86/drivers/modesetting/drmmode_display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index a8d989a24..33f6cea3b 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -1540,7 +1540,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- 
-         /* if we only tested the mode previously, really set it now */
-         if (can_test)
--            drmmode_crtc_set_mode(crtc, FALSE);
-+            ret = drmmode_crtc_set_mode(crtc, FALSE);
-         ms->pending_modeset = FALSE;
-     }
- 
--- 
-2.20.1
-

0003-modesetting-Factor-out-drmmode_target_output.patch

@@ -1,64 +0,0 @@
-From e7f0961638818df8ee91edfae0378a02f7177e9f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 5 Oct 2018 14:00:33 -0400
-Subject: [PATCH xserver 3/4] modesetting: Factor out drmmode_target_output
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- .../drivers/modesetting/drmmode_display.c     | 26 ++++++++++++-------
- 1 file changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index 33f6cea3b..7924aa396 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -757,6 +757,21 @@ drmmode_crtc_disable(xf86CrtcPtr crtc)
-     return ret;
- }
- 
-+static xf86OutputPtr
-+drmmode_target_output(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
-+{
-+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-+    int o;
-+
-+    if (config->output[config->compat_output]->crtc == crtc)
-+        return config->output[config->compat_output];
-+
-+    for (o = 0; o < config->num_output; o++)
-+        if (config->output[o]->crtc == crtc)
-+            return config->output[o];
-+
-+    return NULL;
-+}
- static int
- drmmode_crtc_set_mode(xf86CrtcPtr crtc, Bool test_only)
- {
-@@ -3448,7 +3463,6 @@ drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw)
-         xf86CrtcPtr crtc = config->crtc[c];
-         drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-         xf86OutputPtr output = NULL;
--        int o;
- 
-         /* Skip disabled CRTCs */
-         if (!crtc->enabled) {
-@@ -3459,15 +3473,7 @@ drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw)
-             continue;
-         }
- 
--        if (config->output[config->compat_output]->crtc == crtc)
--            output = config->output[config->compat_output];
--        else {
--            for (o = 0; o < config->num_output; o++)
--                if (config->output[o]->crtc == crtc) {
--                    output = config->output[o];
--                    break;
--                }
--        }
-+        output = drmmode_target_output(pScrn, crtc);
-         /* paranoia */
-         if (!output)
-             continue;
--- 
-2.20.1
-

0004-modesetting-Use-atomic-instead-of-per-crtc-walks-whe.patch

@@ -1,245 +0,0 @@
-From e4e389447c59c89d39a5a78a5f19cdfd22d7699c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 5 Oct 2018 14:09:35 -0400
-Subject: [PATCH xserver 4/4] modesetting: Use atomic instead of per-crtc walks
- where we can
-
-drmmode_set_desired_modes (reachable from CreateScreenResources,
-EnterVT, etc.) currently works by doing ->set_mode_major on each CRTC.
-This is silly, as atomic lets us configure every CRTC at once. It's also
-fragile, because we're not trying very hard to ensure the intermediate
-states are valid.
-
-This patch introduces drmmode_set_mode_atomic, which blasts the entire
-RANDR state into the kernel in an... atomic... fashion. We change
-drmmode_set_desired_modes and drmmode_xf86crtc_resize to use this
-instead of walking each CRTC. We also change drmmode_crtc_set_mode to
-use this, so that client RANDR requests (operating CRTC-at-a-time, since
-RANDR doesn't have atomic changes yet) use the same code paths.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- .../drivers/modesetting/drmmode_display.c     | 179 +++++++++++-------
- 1 file changed, 109 insertions(+), 70 deletions(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index 7924aa396..020678155 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -772,6 +772,96 @@ drmmode_target_output(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
- 
-     return NULL;
- }
-+
-+static int
-+drmmode_set_mode_atomic(ScrnInfoPtr scrn, modesettingPtr ms, Bool test_only)
-+{
-+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-+    drmModeAtomicReq *req = drmModeAtomicAlloc();
-+    uint32_t flags = DRM_MODE_ATOMIC_ALLOW_MODESET;
-+    int i, j, ret = 0;
-+
-+    if (!req)
-+        return 1;
-+
-+    for (i = 0; i < xf86_config->num_crtc; i++) {
-+        xf86CrtcPtr crtc = xf86_config->crtc[i];
-+        drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-+        Bool active = crtc->enabled;
-+        uint32_t fb_id;
-+        int x, y;
-+        drmModeModeInfo kmode;
-+
-+        if (active) {
-+            drmmode_ConvertToKMode(crtc->scrn, &kmode, &crtc->desiredMode);
-+            ret |= drm_mode_ensure_blob(crtc, kmode);
-+
-+            /* XXX this probably doesn't belong here */
-+            if (!crtc->mode.HDisplay && crtc->desiredMode.HDisplay)
-+                memcpy(&crtc->mode, &crtc->desiredMode, sizeof(crtc->mode));
-+        }
-+
-+        ret |= !drmmode_crtc_get_fb_id(crtc, &fb_id, &x, &y);
-+        ret |= crtc_add_prop(req, drmmode_crtc,
-+                             DRMMODE_CRTC_ACTIVE, active);
-+        ret |= crtc_add_prop(req, drmmode_crtc,
-+                             DRMMODE_CRTC_MODE_ID,
-+                             active ? drmmode_crtc->current_mode->blob_id : 0);
-+        ret |= plane_add_props(req, crtc, active ? fb_id : 0, x, y);
-+    }
-+
-+    for (i = 0; i < xf86_config->num_output; i++) {
-+        xf86OutputPtr output = xf86_config->output[i];
-+        drmmode_output_private_ptr drmmode_output = output->driver_private;
-+        drmmode_crtc_private_ptr drm_crtc =
-+            output->crtc ? output->crtc->driver_private : NULL;
-+
-+        if (drmmode_output->output_id == -1)
-+            continue;
-+
-+        ret |= connector_add_prop(req, drmmode_output,
-+                                  DRMMODE_CONNECTOR_CRTC_ID,
-+                                  drm_crtc ? drm_crtc->mode_crtc->crtc_id : 0);
-+    }
-+
-+    if (test_only)
-+        flags |= DRM_MODE_ATOMIC_TEST_ONLY;
-+
-+    if (ret == 0)
-+        ret = drmModeAtomicCommit(ms->fd, req, flags, NULL);
-+
-+    if (ret == 0 && !test_only) {
-+        for (i = 0; i < xf86_config->num_crtc; i++) {
-+            xf86CrtcPtr crtc = xf86_config->crtc[i];
-+            for (j = 0; i < xf86_config->num_output; i++) {
-+                xf86OutputPtr output = xf86_config->output[j];
-+                drmmode_output_private_ptr drmmode_output =
-+                    output->driver_private;
-+
-+                if (output->crtc == crtc)
-+                    drmmode_output->current_crtc = crtc;
-+                else if (drmmode_output->current_crtc == crtc)
-+                    drmmode_output->current_crtc = NULL;
-+            }
-+        }
-+    }
-+
-+    if (ret == 0 && test_only) {
-+        for (i = 0; i < xf86_config->num_crtc; i++) {
-+            xf86CrtcPtr crtc = xf86_config->crtc[i];
-+            crtc->mode = crtc->desiredMode;
-+            crtc->rotation = crtc->desiredRotation;
-+            crtc->x = crtc->desiredX;
-+            crtc->y = crtc->desiredY;
-+            if (!xf86CrtcRotate(crtc))
-+                ret = 1;
-+        }
-+    }
-+
-+    drmModeAtomicFree(req);
-+    return ret;
-+}
-+
- static int
- drmmode_crtc_set_mode(xf86CrtcPtr crtc, Bool test_only)
- {
-@@ -786,73 +876,12 @@ drmmode_crtc_set_mode(xf86CrtcPtr crtc, Bool test_only)
-     int x, y;
-     int i, ret = 0;
- 
-+    if (ms->atomic_modeset)
-+        return drmmode_set_mode_atomic(crtc->scrn, ms, test_only);
-+
-     if (!drmmode_crtc_get_fb_id(crtc, &fb_id, &x, &y))
-         return 1;
- 
--    if (ms->atomic_modeset) {
--        drmModeAtomicReq *req = drmModeAtomicAlloc();
--        Bool active;
--        uint32_t flags = DRM_MODE_ATOMIC_ALLOW_MODESET;
--
--        if (!req)
--            return 1;
--
--        ret |= crtc_add_dpms_props(req, crtc, DPMSModeOn, &active);
--        ret |= plane_add_props(req, crtc, active ? fb_id : 0, x, y);
--
--        /* Orphaned CRTCs need to be disabled right now in atomic mode */
--        for (i = 0; i < xf86_config->num_crtc; i++) {
--            xf86CrtcPtr other_crtc = xf86_config->crtc[i];
--            drmmode_crtc_private_ptr other_drmmode_crtc = other_crtc->driver_private;
--            int lost_outputs = 0;
--            int remaining_outputs = 0;
--            int j;
--
--            if (other_crtc == crtc)
--                continue;
--
--            for (j = 0; j < xf86_config->num_output; j++) {
--                xf86OutputPtr output = xf86_config->output[j];
--                drmmode_output_private_ptr drmmode_output = output->driver_private;
--
--                if (drmmode_output->current_crtc == other_crtc) {
--                    if (output->crtc == crtc)
--                        lost_outputs++;
--                    else
--                        remaining_outputs++;
--                }
--            }
--
--            if (lost_outputs > 0 && remaining_outputs == 0) {
--                ret |= crtc_add_prop(req, other_drmmode_crtc,
--                                     DRMMODE_CRTC_ACTIVE, 0);
--                ret |= crtc_add_prop(req, other_drmmode_crtc,
--                                     DRMMODE_CRTC_MODE_ID, 0);
--            }
--        }
--
--        if (test_only)
--            flags |= DRM_MODE_ATOMIC_TEST_ONLY;
--
--        if (ret == 0)
--            ret = drmModeAtomicCommit(ms->fd, req, flags, NULL);
--
--        if (ret == 0 && !test_only) {
--            for (i = 0; i < xf86_config->num_output; i++) {
--                xf86OutputPtr output = xf86_config->output[i];
--                drmmode_output_private_ptr drmmode_output = output->driver_private;
--
--                if (output->crtc == crtc)
--                    drmmode_output->current_crtc = crtc;
--                else if (drmmode_output->current_crtc == crtc)
--                    drmmode_output->current_crtc = NULL;
--            }
--        }
--
--        drmModeAtomicFree(req);
--        return ret;
--    }
--
-     output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
-     if (!output_ids)
-         return -1;
-@@ -3199,14 +3228,19 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
-     if (!drmmode_glamor_handle_new_screen_pixmap(drmmode))
-         goto fail;
- 
--    for (i = 0; i < xf86_config->num_crtc; i++) {
--        xf86CrtcPtr crtc = xf86_config->crtc[i];
-+    if (ms->atomic_modeset) {
-+        if (drmmode_set_mode_atomic(scrn, ms, FALSE))
-+            goto fail;
-+    } else {
-+        for (i = 0; i < xf86_config->num_crtc; i++) {
-+            xf86CrtcPtr crtc = xf86_config->crtc[i];
- 
--        if (!crtc->enabled)
--            continue;
-+            if (!crtc->enabled)
-+                continue;
- 
--        drmmode_set_mode_major(crtc, &crtc->mode,
--                               crtc->rotation, crtc->x, crtc->y);
-+            drmmode_set_mode_major(crtc, &crtc->mode,
-+                                   crtc->rotation, crtc->x, crtc->y);
-+        }
-     }
- 
-     if (old_fb_id) {
-@@ -3457,8 +3491,13 @@ Bool
- drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode, Bool set_hw)
- {
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-+    modesettingPtr ms = modesettingPTR(pScrn);
-     int c;
- 
-+    /* drmmode_set_mode_atomic returns 0 on success, we return TRUE */
-+    if (ms->atomic_modeset)
-+        return !drmmode_set_mode_atomic(pScrn, ms, /* test_only = */ !set_hw);
-+
-     for (c = 0; c < config->num_crtc; c++) {
-         xf86CrtcPtr crtc = config->crtc[c];
-         drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
--- 
-2.20.1
-

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

Makefile

@@ -1,30 +0,0 @@
-# Makefile for source rpm: xorg-x11-server
-# $Id$
-NAME := xorg-x11-server
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
-
-ifeq ($(MAKECMDGOALS),me a sandwich)
-.PHONY :: me a sandwich
-me a:
-	@:
-
-sandwich:
-	@[ `id -u` -ne 0 ] && echo "What? Make it yourself." || echo Okay.
-endif

commitid

@@ -1 +0,0 @@
-d13cb974426f7f1110b0bdb08c4ebb46ff8975f7

gitignore

@@ -1,306 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-.msg
-*.lo
-*.la
-*.a
-*.o
-*~
-.*sw?
-*.pbxuser
-*.mode1v3
-obj*
-build*
-local
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.log
-config.status
-config.sub
-configure
-configure.lineno
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-TAGS
-tags
-ylwrap
-xorg-server.pc
-stamp-h?
-do-not-use-config.h
-do-not-use-config.h.in
-afb/afbbltC.c
-afb/afbbltCI.c
-afb/afbbltG.c
-afb/afbbltO.c
-afb/afbbltX.c
-afb/afbseg.c
-afb/afbtileC.c
-afb/afbtileG.c
-cfb/cfb8lineCO.c
-cfb/cfb8lineCP.c
-cfb/cfb8lineG.c
-cfb/cfb8lineX.c
-cfb/cfb8segC.c
-cfb/cfb8segCS.c
-cfb/cfb8segX.c
-cfb/cfb8setG.c
-cfb/cfbbltC.c
-cfb/cfbbltG.c
-cfb/cfbbltO.c
-cfb/cfbbltX.c
-cfb/cfbfillarcC.c
-cfb/cfbfillarcG.c
-cfb/cfbglrop8.c
-cfb/cfbply1rctC.c
-cfb/cfbply1rctG.c
-cfb/cfbseg.c
-cfb/cfbsolidC.c
-cfb/cfbsolidG.c
-cfb/cfbsolidX.c
-cfb/cfbtile32C.c
-cfb/cfbtile32G.c
-cfb/cfbtileoddC.c
-cfb/cfbtileoddG.c
-cfb/cfbzerarcC.c
-cfb/cfbzerarcG.c
-cfb/cfbzerarcX.c
-cfb32/cfb8lineCO.c
-cfb32/cfb8lineCP.c
-cfb32/cfb8lineG.c
-cfb32/cfb8lineX.c
-cfb32/cfb8segC.c
-cfb32/cfb8segCS.c
-cfb32/cfb8segX.c
-cfb32/cfb8setG.c
-cfb32/cfbbltC.c
-cfb32/cfbbltG.c
-cfb32/cfbbltO.c
-cfb32/cfbbltX.c
-cfb32/cfbfillarcC.c
-cfb32/cfbfillarcG.c
-cfb32/cfbply1rctC.c
-cfb32/cfbply1rctG.c
-cfb32/cfbseg.c
-cfb32/cfbsolidC.c
-cfb32/cfbsolidG.c
-cfb32/cfbsolidX.c
-cfb32/cfbtile32C.c
-cfb32/cfbtile32G.c
-cfb32/cfbtileoddC.c
-cfb32/cfbtileoddG.c
-cfb32/cfbzerarcC.c
-cfb32/cfbzerarcG.c
-cfb32/cfbzerarcX.c
-doc/Xserver.1x
-doc/Xserver.man
-hw/dmx/Xdmx
-hw/dmx/Xdmx.1x
-hw/dmx/config/dmxtodmx
-hw/dmx/config/dmxtodmx.1x
-hw/dmx/config/parser.c
-hw/dmx/config/parser.h
-hw/dmx/config/scanner.c
-hw/dmx/config/vdltodmx
-hw/dmx/config/vdltodmx.1x
-hw/dmx/config/xdmxconfig
-hw/dmx/config/xdmxconfig.1x
-hw/dmx/examples/dmxaddinput
-hw/dmx/examples/dmxaddscreen
-hw/dmx/examples/dmxreconfig
-hw/dmx/examples/dmxresize
-hw/dmx/examples/dmxrminput
-hw/dmx/examples/dmxrmscreen
-hw/dmx/examples/dmxwininfo
-hw/dmx/examples/ev
-hw/dmx/examples/evi
-hw/dmx/examples/res
-hw/dmx/examples/xbell
-hw/dmx/examples/xdmx
-hw/dmx/examples/xinput
-hw/dmx/examples/xled
-hw/dmx/examples/xtest
-hw/kdrive/ati/Xati
-hw/kdrive/chips/Xchips
-hw/kdrive/ephyr/Xephyr
-hw/kdrive/epson/Xepson
-hw/kdrive/fake/Xfake
-hw/kdrive/fbdev/Xfbdev
-hw/kdrive/i810/Xi810
-hw/kdrive/mach64/Xmach64
-hw/kdrive/mga/Xmga
-hw/kdrive/neomagic/Xneomagic
-hw/kdrive/nvidia/Xnvidia
-hw/kdrive/pm2/Xpm2
-hw/kdrive/r128/Xr128
-hw/kdrive/sdl/Xsdl
-hw/kdrive/sis300/Xsis
-hw/kdrive/smi/Xsmi
-hw/kdrive/vesa/Xvesa
-hw/kdrive/via/Xvia
-hw/vfb/Xvfb
-hw/vfb/Xvfb.1x
-hw/vfb/Xvfb.man
-hw/xfree86/Xorg
-hw/xfree86/common/xf86Build.h
-hw/xfree86/common/xf86DefModeSet.c
-hw/xfree86/doc/man/Xorg.1x
-hw/xfree86/doc/man/Xorg.man
-hw/xfree86/doc/man/xorg.conf.5x
-hw/xfree86/doc/man/xorg.conf.man
-hw/xfree86/exa/exa.4
-hw/xfree86/exa/exa.4x
-hw/xfree86/exa/exa.man
-hw/xfree86/fbdevhw/fbdevhw.4x
-hw/xfree86/fbdevhw/fbdevhw.man
-hw/xfree86/getconfig/cfg.man
-hw/xfree86/getconfig/getconfig.1x
-hw/xfree86/getconfig/getconfig.5x
-hw/xfree86/getconfig/getconfig.man
-hw/xfree86/os-support/xorgos.c
-hw/xfree86/osandcommon.c
-hw/xfree86/ramdac/xf86BitOrder.c
-hw/xfree86/scanpci/xf86PciData.c
-hw/xfree86/scanpci/xf86PciIds.h
-hw/xfree86/utils/cvt/cvt
-hw/xfree86/utils/cvt/cvt.man
-hw/xfree86/utils/gtf/gtf
-hw/xfree86/utils/gtf/gtf.1x
-hw/xfree86/utils/gtf/gtf.man
-hw/xfree86/utils/ioport/inb
-hw/xfree86/utils/ioport/inl
-hw/xfree86/utils/ioport/inw
-hw/xfree86/utils/ioport/ioport
-hw/xfree86/utils/ioport/outb
-hw/xfree86/utils/ioport/outl
-hw/xfree86/utils/ioport/outw
-hw/xfree86/utils/pcitweak/pcitweak
-hw/xfree86/utils/pcitweak/pcitweak.1x
-hw/xfree86/utils/pcitweak/pcitweak.man
-hw/xfree86/utils/scanpci/scanpci
-hw/xfree86/utils/scanpci/scanpci.1x
-hw/xfree86/utils/scanpci/scanpci.man
-hw/xfree86/utils/xorgcfg/XOrgCfg
-hw/xfree86/utils/xorgcfg/xorgcfg
-hw/xfree86/utils/xorgcfg/xorgcfg.1x
-hw/xfree86/utils/xorgcfg/xorgcfg.man
-hw/xfree86/utils/xorgconfig/xorgconfig
-hw/xfree86/utils/xorgconfig/xorgconfig.1x
-hw/xfree86/utils/xorgconfig/xorgconfig.man
-hw/xfree86/xaa/l-xaaBitmap.c
-hw/xfree86/xaa/l-xaaStipple.c
-hw/xfree86/xaa/l-xaaTEGlyph.c
-hw/xfree86/xaa/l3-xaaBitmap.c
-hw/xfree86/xaa/l3-xaaStipple.c
-hw/xfree86/xaa/lf-xaaBitmap.c
-hw/xfree86/xaa/lf-xaaStipple.c
-hw/xfree86/xaa/lf-xaaTEGlyph.c
-hw/xfree86/xaa/lf3-xaaBitmap.c
-hw/xfree86/xaa/lf3-xaaStipple.c
-hw/xfree86/xaa/m-xaaBitmap.c
-hw/xfree86/xaa/m-xaaStipple.c
-hw/xfree86/xaa/m-xaaTEGlyph.c
-hw/xfree86/xaa/m3-xaaBitmap.c
-hw/xfree86/xaa/m3-xaaStipple.c
-hw/xfree86/xaa/mf-xaaBitmap.c
-hw/xfree86/xaa/mf-xaaStipple.c
-hw/xfree86/xaa/mf-xaaTEGlyph.c
-hw/xfree86/xaa/mf3-xaaBitmap.c
-hw/xfree86/xaa/mf3-xaaStipple.c
-hw/xfree86/xaa/s-xaaDashLine.c
-hw/xfree86/xaa/s-xaaLine.c
-hw/xfree86/xf1bpp/maskbits.c
-hw/xfree86/xf1bpp/mfbbitblt.c
-hw/xfree86/xf1bpp/mfbbltC.c
-hw/xfree86/xf1bpp/mfbbltCI.c
-hw/xfree86/xf1bpp/mfbbltG.c
-hw/xfree86/xf1bpp/mfbbltO.c
-hw/xfree86/xf1bpp/mfbbltX.c
-hw/xfree86/xf1bpp/mfbbres.c
-hw/xfree86/xf1bpp/mfbbresd.c
-hw/xfree86/xf1bpp/mfbclip.c
-hw/xfree86/xf1bpp/mfbcmap.c
-hw/xfree86/xf1bpp/mfbfillarc.c
-hw/xfree86/xf1bpp/mfbfillrct.c
-hw/xfree86/xf1bpp/mfbfillsp.c
-hw/xfree86/xf1bpp/mfbfont.c
-hw/xfree86/xf1bpp/mfbgc.c
-hw/xfree86/xf1bpp/mfbgetsp.c
-hw/xfree86/xf1bpp/mfbigbblak.c
-hw/xfree86/xf1bpp/mfbigbwht.c
-hw/xfree86/xf1bpp/mfbhrzvert.c
-hw/xfree86/xf1bpp/mfbimage.c
-hw/xfree86/xf1bpp/mfbline.c
-hw/xfree86/xf1bpp/mfbmisc.c
-hw/xfree86/xf1bpp/mfbpablack.c
-hw/xfree86/xf1bpp/mfbpainv.c
-hw/xfree86/xf1bpp/mfbpawhite.c
-hw/xfree86/xf1bpp/mfbpgbblak.c
-hw/xfree86/xf1bpp/mfbpgbinv.c
-hw/xfree86/xf1bpp/mfbpgbwht.c
-hw/xfree86/xf1bpp/mfbpixmap.c
-hw/xfree86/xf1bpp/mfbplyblack.c
-hw/xfree86/xf1bpp/mfbplyinv.c
-hw/xfree86/xf1bpp/mfbplywhite.c
-hw/xfree86/xf1bpp/mfbpntwin.c
-hw/xfree86/xf1bpp/mfbpolypnt.c
-hw/xfree86/xf1bpp/mfbpushpxl.c
-hw/xfree86/xf1bpp/mfbscrclse.c
-hw/xfree86/xf1bpp/mfbscrinit.c
-hw/xfree86/xf1bpp/mfbseg.c
-hw/xfree86/xf1bpp/mfbsetsp.c
-hw/xfree86/xf1bpp/mfbteblack.c
-hw/xfree86/xf1bpp/mfbtewhite.c
-hw/xfree86/xf1bpp/mfbtileC.c
-hw/xfree86/xf1bpp/mfbtileG.c
-hw/xfree86/xf1bpp/mfbwindow.c
-hw/xfree86/xf1bpp/mfbzerarc.c
-hw/xfree86/xf4bpp/mfbseg.c
-hw/xfree86/xf8_32bpp/cfbgc32.c
-hw/xfree86/xf8_32bpp/cfbgc8.c
-hw/xfree86/xorg.c
-hw/xfree86/xorg.conf.example
-hw/xfree86/xorg.conf.example.pre
-hw/xnest/Xnest
-hw/xnest/Xnest.1x
-hw/xnest/Xnest.man
-hw/xprint/Xprt
-hw/xprint/config/C/print/Xprinters.ghostscript
-hw/xprint/doc/Xprt.1x
-hw/xprint/doc/Xprt.man
-hw/xprint/dpmsstubs-wrapper.c
-hw/xprint/miinitext-wrapper.c
-include/dix-config.h
-include/kdrive-config.h
-include/xgl-config.h
-include/xkb-config.h
-include/xorg-config.h
-include/xorg-server.h
-include/xwin-config.h
-mfb/mfbbltC.c
-mfb/mfbbltCI.c
-mfb/mfbbltG.c
-mfb/mfbbltO.c
-mfb/mfbbltX.c
-mfb/mfbigbblak.c
-mfb/mfbigbwht.c
-mfb/mfbpablack.c
-mfb/mfbpainv.c
-mfb/mfbpawhite.c
-mfb/mfbpgbblak.c
-mfb/mfbpgbinv.c
-mfb/mfbpgbwht.c
-mfb/mfbplyblack.c
-mfb/mfbplyinv.c
-mfb/mfbplywhite.c
-mfb/mfbseg.c
-mfb/mfbteblack.c
-mfb/mfbtewhite.c
-mfb/mfbtileC.c
-mfb/mfbtileG.c

import.log

@@ -1,6 +0,0 @@
-xorg-x11-server-1_5_0-1_fc10:HEAD:xorg-x11-server-1.5.0-1.fc10.src.rpm:1220485219
-xorg-x11-server-1_5_1-1_fc10:HEAD:xorg-x11-server-1.5.1-1.fc10.src.rpm:1222198557
-xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x11-server-1.5.2-1.fc10.src.rpm:1223667007
-xorg-x11-server-1_5_3-1_fc10:HEAD:xorg-x11-server-1.5.3-1.fc10.src.rpm:1225918317
-xorg-x11-server-1_6_0-1_fc11:HEAD:xorg-x11-server-1.6.0-1.fc11.src.rpm:1235594175
-xorg-x11-server-1_6_1-1_fc11:HEAD:xorg-x11-server-1.6.1-1.fc11.src.rpm:1239742477

make-git-snapshot.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=xorg-server-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/xorg/xserver $DIRNAME
-cd $DIRNAME
-if [ -z "$1" ]; then
-    git log | head -1
-else
-    git checkout $1
-fi
-git log | head -1 | awk '{ print $2 }' > ../commitid
-git repack -a -d
-cd ..
-tar cf - $DIRNAME | xz -c9 > $DIRNAME.tar.xz
-rm -rf $DIRNAME

sources

@@ -1 +1 @@
-SHA512 (xorg-server-1.20.6.tar.bz2) = 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6
+SHA512 (xorg-server-21.1.21.tar.xz) = bb2eb4e6756eb9e38b61bd47c017da44bcf5f45f2b7a906b4bb3a56b3d791cec64abb9bf37b224efe1e4fab9cc296f3672c9b2f8e00e1cdfc54337bef63cd16c

xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch

@@ -1,54 +0,0 @@
-From patchwork Wed May 23 09:43:32 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver,
- 1/2] glamor: Always return 0 from glamor_fds_from_pixmap on error
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224909
-Message-Id: <20180523094333.11076-1-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:32 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-This matches what glamor_egl_fds_from_pixmap and dri3_fds_from_pixmap do
-and what proc_dri3_buffers_from_pixmap expects.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
-                     BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
- glamor/glamor.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index d984d20f3..e2c74d17a 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
-         glamor_get_screen_private(pixmap->drawable.pScreen);
- 
-     if (!glamor_priv->dri3_enabled)
--        return -1;
-+        return 0;
-     switch (pixmap_priv->type) {
-     case GLAMOR_TEXTURE_DRM:
-     case GLAMOR_TEXTURE_ONLY:
-         if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
-                                       GL_RGB10_A2 : GL_RGBA, 0))
--            return -1;
-+            return 0;
-         return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
-                                           strides, offsets,
-                                           modifier);
-     default:
-         break;
-     }
--    return -1;
-+    return 0;
- }
- 
- _X_EXPORT int

xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch

@@ -1,58 +0,0 @@
-From patchwork Wed May 23 09:43:33 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver, 2/2] glamor: Propagate glamor_fds_from_pixmap error in
- glamor_fd_from_pixmap
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224910
-Message-Id: <20180523094333.11076-2-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:33 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-glamor_fds_from_pixmap returns 0 on error, but we were treating that as
-success, continuing with uninitialized stride and fd values.
-
-Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
-                     BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- glamor/glamor.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index e2c74d17a..63f0947fa 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -865,17 +865,15 @@ glamor_fd_from_pixmap(ScreenPtr screen,
-                                  &modifier);
- 
-     /* Pixmaps with multi-planes/modifier are not supported in this interface */
--    if (ret > 1) {
--        while (ret > 0)
--            close(fds[--ret]);
--        return -1;
-+    if (ret == 1 && offsets[0] == 0) {
-+        *stride = strides[0];
-+        *size = pixmap->drawable.height * *stride;
-+        return fds[0];
-     }
- 
--    ret = fds[0];
--    *stride = strides[0];
--    *size = pixmap->drawable.height * *stride;
--
--    return ret;
-+    while (ret > 0)
-+        close(fds[--ret]);
-+    return -1;
- }
- 
- _X_EXPORT int

xserver-sdk-abi-requires.git

@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# The X server provides capabilities of the form:
-#
-# Provides: xserver-abi(ansic-0) = 4
-#
-# for an ABI version of 0.4.  The major number is encoded into the name so
-# that major number changes force upgrades.  If we didn't, then
-#
-# Requires: xserver-abi(ansic) >= 0.4
-#
-# would also match 1.0, which is wrong since major numbers mean an ABI break.
-
-echo "xserver-abi($1-@MAJOR@) >= @MINOR@"

xserver-sdk-abi-requires.release

@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# The X server provides capabilities of the form:
-#
-# Provides: xserver-abi(ansic-0) = 4
-#
-# for an ABI version of 0.4.  The major number is encoded into the name so
-# that major number changes force upgrades.  If we didn't, then
-#
-# Requires: xserver-abi(ansic) >= 0.4
-#
-# would also match 1.0, which is wrong since major numbers mean an ABI break.
-
-ver=$(pkg-config --variable abi_$1 xorg-server)
-
-major=$(echo $ver | cut -f 1 -d .)
-minor=$(echo $ver | cut -f 2 -d .)
-
-echo "xserver-abi($1-$major) >= $minor"

xserver.pamd

@@ -1,5 +1,4 @@
 #%PAM-1.0
 auth       sufficient	pam_rootok.so
-auth       required	pam_console.so
 account    required	pam_permit.so
 session    optional	pam_keyinit.so force revoke

xvfb-run.sh

@@ -101,7 +101,7 @@ find_free_servernum() {
 
 # Parse the command line.
 ARGS=$(getopt --options +ade:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
+       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
        --name "$PROGNAME" -- "$@")
 GETOPT_STATUS=$?
 
@@ -120,7 +120,7 @@ while :; do
         -f|--auth-file) AUTHFILE="$2"; shift ;;
         -h|--help) SHOWHELP="yes" ;;
         -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
+        -l|--listen-tcp) LISTENTCP="-listen tcp" ;;
         -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
         -s|--server-args) XVFBARGS="$2"; shift ;;
         -w|--wait) STARTWAIT="$2"; shift ;;