diff -u xorg-server-1.20.6/debian/changelog xorg-server-1.20.6/debian/changelog
--- xorg-server-1.20.6/debian/changelog
+++ xorg-server-1.20.6/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.20.6-1ubuntu2) focal; urgency=medium
+
+  * Cherry-pick upstream commit e1fa3beb; reverts upstream commit 7d33ab0f
+  * Cherry-pick upstream PR
+    https://gitlab.freedesktop.org/xorg/xserver/merge_requests/388
+
+    Fixes LP: #1776447
+
+ -- Daniel Llewellyn <diddledan@ubuntu.com>  Tue, 28 Jan 2020 21:19:01 +0000
+
 xorg-server (2:1.20.6-1ubuntu1) focal; urgency=medium
 
   * Merge from Debian.
diff -u xorg-server-1.20.6/debian/patches/series xorg-server-1.20.6/debian/patches/series
--- xorg-server-1.20.6/debian/patches/series
+++ xorg-server-1.20.6/debian/patches/series
@@ -29,0 +30 @@
+iglx-fix.patch
only in patch2:
unchanged:
--- xorg-server-1.20.6.orig/debian/patches/iglx-fix.patch
+++ xorg-server-1.20.6/debian/patches/iglx-fix.patch
@@ -0,0 +1,29 @@
+Index: xorg-server-1.20.6/glx/glxdri2.c
+===================================================================
+--- xorg-server-1.20.6.orig/glx/glxdri2.c
++++ xorg-server-1.20.6/glx/glxdri2.c
+@@ -295,7 +295,7 @@ __glXDRIcontextWait(__GLXcontext * baseC
+     }
+ 
+     if (ret) {
+-        *error = -1;
++        *error = cl->client->noClientException;
+         return TRUE;
+     }
+ 
+Index: xorg-server-1.20.6/os/io.c
+===================================================================
+--- xorg-server-1.20.6.orig/os/io.c
++++ xorg-server-1.20.6/os/io.c
+@@ -557,6 +557,11 @@ void
+ ResetCurrentRequest(ClientPtr client)
+ {
+     OsCommPtr oc = (OsCommPtr) client->osPrivate;
++
++    /* ignore dying clients */
++    if (!oc)
++        return;
++
+     register ConnectionInputPtr oci = oc->input;
+     register xReq *request;
+     int gotnow, needed;