configure.ac | 6 +++---
debian/changelog | 13 +++++++++----
debian/rules | 1 +
dix/dispatch.c | 2 +-
hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 32 +++++++++++++++++---------------
hw/xwayland/xwayland-shm.c | 10 ++++++++++
include/dixstruct.h | 2 +-
7 files changed, 42 insertions(+), 24 deletions(-)
New commits:
commit 7f179352e41d38389ec3c90b5460f1ff1d39b6b3
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 17 10:52:26 2016 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index e6cdacc..11e41f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,4 @@
-xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium
-
- * New upstream release.
- * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
-
- -- Andreas Boll <andreas.boll....@gmail.com> Mon, 07 Nov 2016 14:55:16 +0100
-
-xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED; urgency=medium
+xorg-server (2:1.19.0-1ubuntu1) UNRELEASED; urgency=medium
[ Timo Aaltonen ]
* Merge from Debian experimental.
@@ -23,6 +16,7 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED;
urgency=medium
* 232-xf86compatoutput-valgrind.patch: This was added upstream
already, no need to carry a duplicate check.
* xmir.patch: Don't check for aiglx enable flag, dropped upstream.
+ * xmir-fixes.diff: Port to new glamor api.
[ Robert Ancell ]
* debian/patches/xmir.patch:
@@ -32,11 +26,15 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED;
urgency=medium
- Support both Mir 0.24 and 0.25 client APIs
- Fix crashing on arm64 (LP: #1642297)
- [ Timo Aaltonen ]
- * xmir-fixes.diff: Port to new glamor api.
-
-- Robert Ancell <robert.anc...@canonical.com> Thu, 17 Nov 2016 15:25:26
+1300
+xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Mon, 07 Nov 2016 14:55:16 +0100
+
xorg-server (2:1.18.99.902-1) experimental; urgency=medium
[ Timo Aaltonen ]
commit 20489c89c893fca4b614350901249039b0e1e5d3
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Wed Nov 16 14:29:17 2016 +0100
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 696cd2f..9d6b1d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.18.99.902-2) UNRELEASED; urgency=medium
+xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium
+ * New upstream release.
* rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
-- Andreas Boll <andreas.boll....@gmail.com> Mon, 07 Nov 2016 14:55:16 +0100
commit 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c
Author: Keith Packard <kei...@keithp.com>
Date: Tue Nov 15 08:12:05 2016 -0800
Bump version to 1.19.0
Signed-off-by: Keith Packard <kei...@keithp.com>
diff --git a/configure.ac b/configure.ac
index 395df80..f7ab48c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.99.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2016-10-28"
-RELEASE_NAME="Shigoku"
+AC_INIT([xorg-server], 1.19.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-11-15"
+RELEASE_NAME="Cioppino"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit ea8efb3a997e15d27d362762e6c85d59487f9864
Author: Keith Packard <kei...@keithp.com>
Date: Wed Nov 2 13:25:33 2016 -0700
dix: Make sure client is not in output_pending chain after closed (RH
1382444)
I think it is possible that output could get queued to a client during
CloseDownClient. After it is removed from the pending queue, active
grabs are released, the client is awoken if sleeping and any work
queue entries related to the client are processed.
To fix this, move the call removing it from the output_pending chain
until after clientGone has been set and then check clientGone in
output_pending_mark.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444
Signed-off-by: Keith Packard <kei...@keithp.com>
Reviewed-by: Hans de Goede <hdego...@redhat.com>
diff --git a/dix/dispatch.c b/dix/dispatch.c
index e111377..3d0fe26 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3406,7 +3406,6 @@ CloseDownClient(ClientPtr client)
UngrabServer(client);
}
mark_client_not_ready(client);
- xorg_list_del(&client->output_pending);
BITCLEAR(grabWaiters, client->index);
DeleteClientFromAnySelections(client);
ReleaseActiveGrabs(client);
@@ -3435,6 +3434,7 @@ CloseDownClient(ClientPtr client)
if (ClientIsAsleep(client))
ClientSignal(client);
ProcessWorkQueueZombies();
+ output_pending_clear(client);
CloseDownConnection(client);
/* If the client made it to the Running stage, nClients has
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 3b578f8..d71b0ac 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -159,7 +159,7 @@ extern struct xorg_list output_pending_clients;
static inline void
output_pending_mark(ClientPtr client)
{
- if (xorg_list_is_empty(&client->output_pending))
+ if (!client->clientGone && xorg_list_is_empty(&client->output_pending))
xorg_list_append(&client->output_pending, &output_pending_clients);
}
commit bdcb4df61e74f395f108e3cbbb9104564d1e30cc
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: Mon Nov 7 14:55:35 2016 +0100
rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
diff --git a/debian/changelog b/debian/changelog
index b86d1e5..696cd2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.99.902-2) UNRELEASED; urgency=medium
+
+ * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
+
+ -- Andreas Boll <andreas.boll....@gmail.com> Mon, 07 Nov 2016 14:55:16 +0100
+
xorg-server (2:1.18.99.902-1) experimental; urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 1f8c783..3515c84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,7 @@ endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2
+ dri += --disable-glamor
xshmfence = --disable-xshmfence
else
dri = --enable-dri --enable-dri2
commit 7513da40a656317ad3aa101651d29373de99c798
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Nov 2 17:18:11 2016 +0200
dri2: Sync i965_pci_ids.h from mesa
Import changes from these mesa commits:
85ea8deb26da420 i965: Removing PCI IDs that are no longer listed as
Kabylake.
bdff2e554735ed9 i956: Add more Kabylake PCI IDs.
f1fa8b4a1ca73fa i965/bxt: Add 2x6 variant
d1ab544bb883d04 i965/chv: Display proper branding
20e8ee36627f874 i965/skl: Update Skylake renderer strings
644c8a515192d28 i965/skl: Add two missing device IDs
Reviewed-by: Adam Jackson <a...@redhat.com>
Signed-off-by: Timo Aaltonen <tjaal...@ubuntu.com>
diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
index 5139e27..1566afd 100644
--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
@@ -112,6 +112,7 @@ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
+CHIPSET(0x190B, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
@@ -122,19 +123,21 @@ CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
-CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
-CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
-CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
+CHIPSET(0x1921, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
+CHIPSET(0x1923, skl_gt3, "Intel(R) Skylake GT3e")
+CHIPSET(0x1926, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
-CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
-CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
-CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
-CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
-CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
+CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics 555 (Skylake GT3e)")
+CHIPSET(0x192D, skl_gt3, "Intel(R) Iris Graphics P555 (Skylake GT3e)")
+CHIPSET(0x1932, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
+CHIPSET(0x193A, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
+CHIPSET(0x193B, skl_gt4, "Intel(R) Iris Pro Graphics 580 (Skylake GT4e)")
+CHIPSET(0x193D, skl_gt4, "Intel(R) Iris Pro Graphics P580 (Skylake GT4e)")
CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
+CHIPSET(0x5908, kbl_gt1, "Intel(R) Kabylake GT1")
CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
@@ -147,17 +150,16 @@ CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
+CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3")
CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
-CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
-CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
-CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
-CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
+CHIPSET(0x5927, kbl_gt3, "Intel(R) Kabylake GT3")
CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
-CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
-CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherryview)")
-CHIPSET(0x22B1, chv, "Intel(R) HD Graphics (Cherryview)")
+CHIPSET(0x22B0, chv, "Intel(R) HD Graphics (Cherrytrail)")
+CHIPSET(0x22B1, chv, "Intel(R) HD Graphics XXX (Braswell)") /* Overridden
in brw_get_renderer_string */
CHIPSET(0x22B2, chv, "Intel(R) HD Graphics (Cherryview)")
CHIPSET(0x22B3, chv, "Intel(R) HD Graphics (Cherryview)")
CHIPSET(0x0A84, bxt, "Intel(R) HD Graphics (Broxton)")
CHIPSET(0x1A84, bxt, "Intel(R) HD Graphics (Broxton)")
+CHIPSET(0x1A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)")
CHIPSET(0x5A84, bxt, "Intel(R) HD Graphics (Broxton)")
+CHIPSET(0x5A85, bxt_2x6, "Intel(R) HD Graphics (Broxton 2x6)")
commit 4cfee398726adf89db4b632ade7d6cab8b78282e
Author: Ian Ray <ian....@ge.com>
Date: Wed May 25 10:41:53 2016 +0300
xwayland-shm: block signals during fallocate
posix_fallocate() does an explicit rollback if it gets EINTR, and
this is a problem on slow systems because when the allocation size
is sufficiently large posix_fallocate() will always be interrupted
by the smart scheduler's SIGALRM.
Changes since v1 - big comment in the code to explain what is going on
Reviewed-by: Adam Jackson <a...@redhat.com>
Signed-off-by: Ian Ray <ian....@ge.com>
Acked-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Acked-by: Daniel Stone <dani...@collabora.com>
diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index daf6148..452d1f5 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -28,6 +28,8 @@
#include <dix-config.h>
#endif
+#include "os.h"
+
#include "xwayland.h"
#include <sys/mman.h>
@@ -139,9 +141,17 @@ os_create_anonymous_file(off_t size)
return -1;
#ifdef HAVE_POSIX_FALLOCATE
+ /*
+ * posix_fallocate does an explicit rollback if it gets EINTR.
+ * Temporarily block signals to allow the call to succeed on
+ * slow systems where the smart scheduler's SIGALRM prevents
+ * large allocation attempts from ever succeeding.
+ */
+ OsBlockSignals();
do {
ret = posix_fallocate(fd, 0, size);
} while (ret == EINTR);
+ OsReleaseSignals();
if (ret != 0) {
close(fd);
