Processed: Re: Bug#759005: xdm: Missing xdm.service, can't use with systemd
Processing control commands: severity -1 important Bug #759005 [xdm] xdm: Missing xdm.service, can't use with systemd Severity set to 'important' from 'wishlist' -- 759005: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759005 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
xorg-server_1.17.2-2_amd64.changes ACCEPTED into experimental, experimental
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Wed, 19 Aug 2015 11:14:05 +0200 Source: xorg-server Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xorg-core-dbg xserver-common xorg-server-source xwayland xserver-xorg-legacy Architecture: source amd64 all Version: 2:1.17.2-2 Distribution: experimental Urgency: medium Maintainer: Debian X Strike Force debian-x@lists.debian.org Changed-By: Julien Cristau jcris...@debian.org Description: xdmx - distributed multihead X server xdmx-tools - Distributed Multihead X tools xnest - Nested X server xorg-server-source - Xorg X server - source files xserver-common - common files used by various X servers xserver-xephyr - nested X server xserver-xorg-core - Xorg X server - core server xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols) xserver-xorg-core-udeb - Xorg X server - core server (udeb) xserver-xorg-dev - Xorg X server - development files xserver-xorg-legacy - setuid root Xorg server wrapper xvfb - Virtual Framebuffer 'fake' X server xwayland - Xwayland X server Changes: xorg-server (2:1.17.2-2) experimental; urgency=medium . [ Laurent Bigonville ] * Enable logind support for the main build on Linux. * Build and ship the setuid root wrapper from upstream, replacing xserver-xorg's. . [ Julien Cristau ] * Take over x11-common's handling of the X wrapper; ship the wrapper in a new xserver-xorg-legacy package. * Patch the wrapper to reset Xorg's environment. I don't believe it needs any variable there, and if that turns out to be wrong we can add a whitelist or hardcode some values. Checksums-Sha1: 3e8dd05254390e5c804331618ba962392c8942fd 4738 xorg-server_1.17.2-2.dsc 874e2425d68fae6681347bbf58bd42f26ccf193f 151519 xorg-server_1.17.2-2.diff.gz 3dee64b63a903debbea0f54853fc008444aa1944 1867542 xdmx-tools_1.17.2-2_amd64.deb 7966da9f110e7cd136b9107afbc52420c8465c6b 2571548 xdmx_1.17.2-2_amd64.deb aa31d7445e03e76acfb2047515ddee77e3940634 2429978 xnest_1.17.2-2_amd64.deb 1fd6edc1bd90d57f6f71b3694f6c86ce3e94659f 6564142 xorg-server-source_1.17.2-2_all.deb 555eb64de5bfc82bebdfdea2be3eb6847c525459 1838208 xserver-common_1.17.2-2_all.deb be9c7f478075d60a474ac874f91ce900f00506a8 2732498 xserver-xephyr_1.17.2-2_amd64.deb 947d09feae0c77e1564d8ae4d0df855920669513 8152208 xserver-xorg-core-dbg_1.17.2-2_amd64.deb f00a17f225398bcde820371aaeb7065b89e3749f 921482 xserver-xorg-core-udeb_1.17.2-2_amd64.udeb 74ea9a710425c7eb7878ea7098b776a46ae8647f 3153600 xserver-xorg-core_1.17.2-2_amd64.deb caa5ed6cc1ac86ff0f716d2a0f9def56bd4848b5 2010830 xserver-xorg-dev_1.17.2-2_amd64.deb 0a60b9907fc78b0410f46cf437cc150f7227c98b 1843998 xserver-xorg-legacy_1.17.2-2_amd64.deb b4b178c7790bf63a9ef31a6bb6a57f39d074ef1c 2576494 xvfb_1.17.2-2_amd64.deb ee681b4c55d424c771713c08115b59280f3f67cb 2649704 xwayland_1.17.2-2_amd64.deb Checksums-Sha256: 477d7688917d553c0f335c6dbdf9ab59ba5175c1e668e25261f616c8d0f07875 4738 xorg-server_1.17.2-2.dsc 7e63c1be87793ed66e3bd7086d991b4e4bc4020bd91e7328c1b0a97c351fa83b 151519 xorg-server_1.17.2-2.diff.gz 16f440a0905aace028dff4bc3982906258312b53fce97eae40bd15b2f5721b9c 1867542 xdmx-tools_1.17.2-2_amd64.deb 83acdf155e01f8ca11aced09650f9667059ec76bd2e80f48d0637257e8f4 2571548 xdmx_1.17.2-2_amd64.deb f775338fc1dccdeaee0f075dfd359fbc7ee85f4bfdb7e77caa2f70df34af7bc9 2429978 xnest_1.17.2-2_amd64.deb 4365914d5f921fb8fe6decc0664b01e1f9705b9d3a56d901b3546ed2423e080f 6564142 xorg-server-source_1.17.2-2_all.deb 2adff157559654bdf4208f172b23cba28600c90c6345d68a31a4d08fe73da161 1838208 xserver-common_1.17.2-2_all.deb 48d6bf378ab86ab86963dd4b24b0ce3438cbc5da33579d5536db3e248d465201 2732498 xserver-xephyr_1.17.2-2_amd64.deb d36f0f53305663dc5d436e72773f125d01be7ab2a3b8bddb626dcc8ea4ba2909 8152208 xserver-xorg-core-dbg_1.17.2-2_amd64.deb e3f010ccf8e548571148195b8f234fddb39fb4361b416e84749eb166b1eabaf2 921482 xserver-xorg-core-udeb_1.17.2-2_amd64.udeb ada9d6439d5176edae3a74a9291d7f7c36044c03d6633965b0ba8ac4bccc1694 3153600 xserver-xorg-core_1.17.2-2_amd64.deb fde616763867f1d49a04f608ba8071d40d79267341053d87147a6cab31530ba3 2010830 xserver-xorg-dev_1.17.2-2_amd64.deb e2793f1b65c181a2aa15e5f7eaff73600fca71a90b7e2fb8b19af8e9de2610a0 1843998 xserver-xorg-legacy_1.17.2-2_amd64.deb 31f8779301e3252eeadc93e01d1e537e9b5f0dac49e8d98af9234ac18bcfa970 2576494 xvfb_1.17.2-2_amd64.deb b6173b7ee2b878aed381256c23b347e54066986bde8e9cd375f23b62bfdba623 2649704 xwayland_1.17.2-2_amd64.deb Files: 0784559894dc2822ddee47ca5f19bb42 4738 x11 optional xorg-server_1.17.2-2.dsc 38b671a5e402a0b109341f6faa095752 151519 x11 optional xorg-server_1.17.2-2.diff.gz 058515a1bc59fdbfccffbd5e145ff591 1867542 x11 optional xdmx-tools_1.17.2-2_amd64.deb d434b581db85fd2458d35ed045c0724e 2571548 x11 optional xdmx_1.17.2-2_amd64.deb c71abfc82bb2447fb2171edb70b9d09a 2429978 x11
xorg-server: Changes to 'debian-experimental'
Xext/shm.c | 10 +- configure.ac | 10 +- debian/changelog | 45 + debian/control | 22 debian/patches/series|1 debian/patches/xorg-wrapper-envp.diff| 21 debian/po/POTFILES.in|1 debian/po/ar.po | 62 debian/po/ast.po | 64 + debian/po/be.po | 58 debian/po/bg.po | 80 debian/po/bn.po | 60 debian/po/bs.po | 70 ++ debian/po/ca.po | 79 debian/po/cs.po | 79 debian/po/da.po | 98 debian/po/de.po | 78 debian/po/dz.po | 73 +++ debian/po/el.po | 84 + debian/po/eo.po | 61 debian/po/es.po | 88 ++ debian/po/eu.po | 82 debian/po/fi.po | 62 debian/po/fr.po | 87 ++ debian/po/gl.po | 68 ++ debian/po/gu.po | 59 debian/po/he.po | 61 debian/po/hr.po | 56 +++ debian/po/hu.po | 56 +++ debian/po/id.po | 74 +++ debian/po/it.po | 85 + debian/po/ja.po | 81 debian/po/kk.po | 55 +++ debian/po/km.po | 70 ++ debian/po/ko.po | 58 debian/po/ku.po | 56 +++ debian/po/lt.po | 71 ++ debian/po/ml.po | 70 ++ debian/po/mr.po | 60 debian/po/nb.po | 63 + debian/po/ne.po | 63 + debian/po/nl.po | 82 debian/po/nn.po | 70 ++ debian/po/pl.po | 66 + debian/po/pothead.in | 30 ++ debian/po/pt.po | 67 + debian/po/pt_BR.po | 85 + debian/po/ro.po | 84 + debian/po/ru.po | 87 ++ debian/po/sk.po | 65 + debian/po/sq.po | 66 + debian/po/sr.po | 60 debian/po/s...@latin.po| 61 debian/po/sv.po | 88 ++ debian/po/ta.po | 70 ++ debian/po/templates.pot | 53 ++ debian/po/th.po | 59 debian/po/tr.po | 83 + debian/po/vi.po | 62 debian/po/wo.po | 61 debian/po/zh_CN.po | 81 debian/po/zh_TW.po | 74 +++ debian/rules | 11 ++ debian/upstream/signing-key.asc | 41 debian/xserver-xorg-core.install |7 + debian/xserver-xorg-legacy.config| 87 ++ debian/xserver-xorg-legacy.install |1 debian/xserver-xorg-legacy.postinst | 77 +++ debian/xserver-xorg-legacy.postrm| 36 +++ debian/xserver-xorg-legacy.templates | 22 dix/devices.c|3 dix/events.c
Bug#759005: xdm: Missing xdm.service, can't use with systemd
Control: severity -1 important Hi! On Fri, 21 Nov 2014 16:02:15 +0100 Alessandro Ghedini gh...@debian.org wrote: Control: tags -1 patch On sab, ago 23, 2014 at 09:30:24 +0200, Sven Joachim wrote: On 2014-08-23 19:52 +0200, Kan-Ru Chen (é³ä¾å¦) wrote: Package: xdm Version: 1:1.1.11-1 Severity: important The xdm upstream ships a xdm.service file however it is not include in the xdm debian package. It would probably make sense to ship it, but care must be taken not to enable the service unless xdm is the default display manager. I wrote a patch that makes the display-manager.service systemd thing work with xdm (see attached patch). The patch does: 1 Patches the systemd service file to not start unless xdm is the default manager (as per /etc/X11/default-display-manager). 2 Removes the [Install] section in the systemd service file so that if the user manually enables the service it does nothing (so that it doesn't conflict with the default manager). 3 Creates the /etc/systemd/system/display-manager.service in postinst if xdm is the dfault manager. 4 Installs the systemd service file. Note that 1 and 3 above actually come from the lightdm package (I only removed the part where it reloads dbus, which is not used by xdm). I'm bumping the severity of this bug report back to important. Without a native .service file and xdm setting up the /etc/systemd/system/display-manager.service symlink, a lot of strange thinks can happen, like repeated start attempts of multiple display managers. For jessie we shipped a hack which mitigated a few of those problems, but not under all conditions. This is a Debian specific patch, which we are going to get rid of for Stretch and it will be removed in unstable soonish. Regards, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
Processing of xorg-server_1.17.2-2_amd64.changes
xorg-server_1.17.2-2_amd64.changes uploaded successfully to localhost along with the files: xorg-server_1.17.2-2.dsc xorg-server_1.17.2-2.diff.gz xdmx-tools_1.17.2-2_amd64.deb xdmx_1.17.2-2_amd64.deb xnest_1.17.2-2_amd64.deb xorg-server-source_1.17.2-2_all.deb xserver-common_1.17.2-2_all.deb xserver-xephyr_1.17.2-2_amd64.deb xserver-xorg-core-dbg_1.17.2-2_amd64.deb xserver-xorg-core-udeb_1.17.2-2_amd64.udeb xserver-xorg-core_1.17.2-2_amd64.deb xserver-xorg-dev_1.17.2-2_amd64.deb xserver-xorg-legacy_1.17.2-2_amd64.deb xvfb_1.17.2-2_amd64.deb xwayland_1.17.2-2_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org)
xorg-server: Changes to 'refs/tags/xorg-server-2_1.17.2-2'
Tag 'xorg-server-2_1.17.2-2' created by Julien Cristau jcris...@debian.org at 2015-08-20 11:56 + Tagging upload of xorg-server 2:1.17.2-2 to experimental. -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJV1cBwAAoJEDEBgAUJBeQMsTYQAPLgorGvKAuO4YwL6v/QRsSC 2SPRLBcKzzz6pvQivHhVufERCe05FThJxzJYevj2EsZh537+eJK6Lj3osyq9Z+vt SWgsF0+EKs7MckQZMZhw11hOf7K5tw5PRWic/tCVpumIeWoe/jsVmg4eVDJFBFKo r468Aa0NIXoveMSsZaRVch+w+eydCX0lEm12zOiAOUXCcucH/g32dwPJca/yzM4h yZ7hZduqsOdlpSfNeEj5TI2VHp8tlQs3RdKrxtstuEgXFWCC7SLlIaUMZKt8uFLW tbZyEIc9Eh0BBiwZZfO/2e9kLvDX3xKc3Z6D4bA8fyhnK4GXUAyC5JQgy4nIDCTn QOIs8eWTIJBnEjGyGIGd+uRAZJae0Sc9uQvgU4OW4H1PBMq/zA3yxnZ2tAmYAsg7 5RE6+IiB7+F1CmD+9DxhdgKaoqlxyjwPAQkjWhL/BNS6XA19WVvY2Rbjep4MzBSf D7nZ4oXoFRTTtTb5GcEU/wcEv20CbjgYp5EPMMSq8pBAZh/R0MrhRnD0na2nvuXn KjISKdM3WXHwQKnimRA/Y7ILbSDScTwHs1KdcS+7FTl7y7tTflbtM8w7lbG/fdfu pt8gAab7dIyqSTbQ9cbhpRhs6/D8yym2xBEizoScrBQXilkaTYTCV+NGl7wFwon4 QiZMlEVwzQk46P2UyocD =fxu5 -END PGP SIGNATURE- Changes since xorg-server-2_1.17.2-1: Julien Cristau (6): Import 2:1.17.2-1.1 NMU Enable logind support on Linux Build and ship upstream's setuid root wrapper instead of our own take over wrapper and related stuff from x11-common Patch the wrapper to reset Xorg's environment Upload to experimental Sven Joachim (2): Install the whole usr/share/man/man4 directory Add bug closure --- debian/changelog | 26 + debian/control| 20 ++ debian/patches/series |1 debian/patches/xorg-wrapper-envp.diff | 21 +++ debian/po/POTFILES.in |1 debian/po/ar.po | 62 + debian/po/ast.po | 64 ++ debian/po/be.po | 58 debian/po/bg.po | 80 +++ debian/po/bn.po | 60 debian/po/bs.po | 70 debian/po/ca.po | 79 +++ debian/po/cs.po | 79 +++ debian/po/da.po | 98 ++ debian/po/de.po | 78 +++ debian/po/dz.po | 73 + debian/po/el.po | 84 + debian/po/eo.po | 61 + debian/po/es.po | 88 ++ debian/po/eu.po | 82 debian/po/fi.po | 62 + debian/po/fr.po | 87 ++ debian/po/gl.po | 68 +++ debian/po/gu.po | 59 debian/po/he.po | 61 + debian/po/hr.po | 56 +++ debian/po/hu.po | 56 +++ debian/po/id.po | 74 + debian/po/it.po | 85 + debian/po/ja.po | 81 debian/po/kk.po | 55 +++ debian/po/km.po | 70 debian/po/ko.po | 58 debian/po/ku.po | 56 +++ debian/po/lt.po | 71 debian/po/ml.po | 70 debian/po/mr.po | 60 debian/po/nb.po | 63 + debian/po/ne.po | 63 + debian/po/nl.po | 82 debian/po/nn.po | 70 debian/po/pl.po | 66 ++ debian/po/pothead.in | 30 ++ debian/po/pt.po | 67 +++ debian/po/pt_BR.po| 85 + debian/po/ro.po | 84 + debian/po/ru.po | 87 ++ debian/po/sk.po | 65 ++ debian/po/sq.po | 66 ++ debian/po/sr.po | 60 debian/po/s...@latin.po | 61 + debian/po/sv.po | 88
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 27 ++-
debian/patches/series|2
debian/patches/sna-check-for-system-memory-contents.diff | 35 +++
3 files changed, 61 insertions(+), 3 deletions(-)
New commits:
commit 2c74f66eebee681ffe0d1e4d085a74760b449991
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Aug 20 14:16:36 2015 +0300
release to wily
diff --git a/debian/changelog b/debian/changelog
index e65da47..921859e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED;
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) wily; urgency=medium
[ Robert Hooker ]
* Merge from debian-experimental
@@ -13,7 +13,7 @@ xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1)
UNRELEASED; urgency=m
* sna-check-for-system-memory-contents.diff: Fix corruption on
lightdm, while logging in and blank background on unity.
- -- Robert Hooker sarv...@ubuntu.com Wed, 19 Aug 2015 00:42:34 -0400
+ -- Timo Aaltonen tjaal...@debian.org Thu, 20 Aug 2015 14:14:34 +0300
xserver-xorg-video-intel (2:2.99.917+git20150808-1~exp1) UNRELEASED;
urgency=medium
commit bd507c837a9cf766dc5493d3739e296aa1f37edf
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Aug 20 14:14:31 2015 +0300
don't forget to add the patch
diff --git a/debian/patches/sna-check-for-system-memory-contents.diff
b/debian/patches/sna-check-for-system-memory-contents.diff
new file mode 100644
index 000..7fbdf1e
--- /dev/null
+++ b/debian/patches/sna-check-for-system-memory-contents.diff
@@ -0,0 +1,35 @@
+commit 78f7451886f0a33df717c57fc1a079ee7e6f221e
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Thu Aug 20 10:43:05 2015 +0100
+
+sna: Check for system memory contents when looking for empty sources
+
+Fixes a regression from
+commit 3f128867d957e30690218404337b00bb327e647b
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Fri Aug 7 15:19:17 2015 +0100
+
+sna: Skip a no-op copy
+
+that forgot that we can flush damage but still have valid contents to
+copy from.
+
+Reported-by: Timo Aaltonen tjaal...@ubuntu.com
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index c624d9e..937d6a8 100644
+--- a/src/sna/sna_accel.c
b/src/sna/sna_accel.c
+@@ -6446,8 +6446,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr
gc,
+ assert(region_num_rects(region));
+
+ if (src_priv
+- src_priv-gpu_damage == NULL
+- src_priv-cpu_damage == NULL) {
++ src_priv-gpu_bo == NULL
++ src_priv-cpu_bo == NULL
++ src_priv-ptr == NULL) {
+ /* Rare but still happens, nothing to copy */
+ DBG((%s: src pixmap=%ld is empty\n,
+__FUNCTION__, src_pixmap-drawable.serialNumber));
commit 91a8056d9e59027908b70855310db88f037371f3
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Aug 20 14:12:51 2015 +0300
add changelog for 2:2.99.917-1ubuntu1 back
diff --git a/debian/changelog b/debian/changelog
index 04a4172..e65da47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,24 @@ xserver-xorg-video-intel (2:2.99.917-2) unstable;
urgency=medium
-- Vincent Cheng vch...@debian.org Thu, 16 Jul 2015 01:00:41 -0700
+xserver-xorg-video-intel (2:2.99.917-1ubuntu1) wily; urgency=medium
+
+ * Merge with Debian, remaining Ubuntu changes:
+ * debian/rules:
+- Fix valgrind-enabling check (DEB_HOST_ARCH_OS instead of DEB_HOST_ARCH)
+- Use SNA by default.
+ * debian/patches/fix-sna-external-slave-rotation.patch:
+- Fix rotating external display with optimus results in corruption.
+ * debian/patches/fix-sna-fstat-include.patch:
+ * debian/patches/fix-uxa-fstat-include.patch:
+- Fix missing include for fstat
+ * debian/patches/fix-yuv-to-rgb-shared-on-intel-gen8.patch:
+- Fix faulty yuv2rgb translation on Intel Generation 8 Graphics.
+ * debian/patches/sna-force-frontbuffer-to-cpu-for-randr-fallback.diff:
+- Fix rotation on SKL.
+
+ -- Robert Ancell robert.anc...@canonical.com Tue, 14 Jul 2015 15:21:57
+1200
+
xserver-xorg-video-intel (2:2.99.917-1) unstable; urgency=medium
* Upload to unstable. (Closes: #748753)
commit 76fc9825aa416165349f5d588317f694e9955272
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Aug 20 14:04:15 2015 +0300
sna-check-for-system-memory-contents.diff: Fix corruption on lightdm, while
logging in and blank background on unity.
diff --git a/debian/changelog b/debian/changelog
index 0e7222c..04a4172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xserver-xorg-video-intel (2:2.99.917+git20150808-0ubuntu1) UNRELEASED;
urgency=medium
+ [ Robert Hooker ]
* Merge from debian-experimental
-
xorg-server_1.17.2-2_amd64.changes is NEW
binary:xserver-xorg-legacy is NEW. Your package has been put into the NEW queue, which requires manual action from the ftpteam to process. The upload was otherwise valid (it had a good OpenPGP signature and file hashes are valid), so please be patient. Packages are routinely processed through to the archive, and do feel free to browse the NEW queue[1]. If there is an issue with the upload, you will recieve an email from a member of the ftpteam. If you have any questions, you may reply to this email. [1]: https://ftp-master.debian.org/new.html
xorg-server: Changes to 'ubuntu'
debian/changelog | 14
debian/patches/xmir-desktop-file-hint-flag.patch |4 +-
debian/patches/xmir-rootless.patch | 34 ++---
debian/patches/xmir.patch| 36 +--
4 files changed, 60 insertions(+), 28 deletions(-)
New commits:
commit 57450213538280a57d6601fc4d4e5f493b6df0d5
Author: Robert Ancell robert.anc...@canonical.com
Date: Fri Aug 21 14:51:34 2015 +1200
debian/patches/xmir-rootless.patch:
* debian/patches/xmir-rootless.patch:
- Fix crash when running XMir in rootless mode (LP: #1472097)
diff --git a/debian/changelog b/debian/changelog
index 3f37f39..5d373f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
+
+ * debian/patches/xmir-rootless.patch:
+- Fix crash when running XMir in rootless mode (LP: #1472097)
+
+ -- Robert Ancell robert.anc...@canonical.com Thu, 20 Aug 2015 16:31:37
+1200
+
xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index b6b7bbd..f3bef1e 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,4 +1,4 @@
-From 2cf1ea480b7ebcecc61509a54b27b685c4ccfc53 Mon Sep 17 00:00:00 2001
+From a7b78b9c0eee1a53e0fed309474aa6cc76656ffc Mon Sep 17 00:00:00 2001
From: Robert Ancell robert.anc...@canonical.com
Date: Thu, 9 Jul 2015 14:03:49 +1200
Subject: [PATCH 2/4] xmir: Support rootless
@@ -167,7 +167,7 @@ index f958e87..c1770d5 100644
xmir_screen-windowed = 1;
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 4afd66e..ef78cca 100644
+index 4afd66e..13224aa 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -33,6 +33,7 @@
@@ -202,14 +202,14 @@ index 4afd66e..ef78cca 100644
-if (window-parent)
-return ret;
-+if (xmir_screen-rootless) {
-+if (!window-parent) {
-+CompositeRedirectSubwindows(window,
/*CompositeRedirectManual*/TRUE); // WTF? Where is this defined
-+RegionNull(window-clipList);
-+RegionNull(window-borderClip);
-+RegionNull(window-winSize);
-+}
++if (xmir_screen-rootless !window-parent) {
++RegionNull(window-clipList);
++RegionNull(window-borderClip);
++RegionNull(window-winSize);
++}
+
++if (xmir_screen-rootless) {
++CompositeRedirectSubwindows(window, /*CompositeRedirectManual*/TRUE);
// WTF? Where is this defined
+if (window-redirectDraw != RedirectDrawManual)
+return ret;
+}
@@ -292,5 +292,5 @@ index e43fa40..b67f3a1 100644
CreateScreenResourcesProcPtr CreateScreenResources;
CloseScreenProcPtr CloseScreen;
--
-2.4.6
+2.5.0
commit e66034f70fbf0962877cfd3adfe18d3503d54aa9
Author: Robert Ancell robert.anc...@canonical.com
Date: Fri Aug 21 14:51:20 2015 +1200
debian/patches/xmir.patch:
* debian/patches/xmir.patch:
- Fix red and blue channels being swapped on Android drivers (LP:
#1471146)
diff --git a/debian/changelog b/debian/changelog
index 6b05edc..3f37f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu3) wily; urgency=medium
+
+ * debian/patches/xmir.patch:
+- Fix red and blue channels being swapped on Android drivers (LP: #1471146)
+
+ -- Robert Ancell robert.anc...@canonical.com Thu, 30 Jul 2015 15:31:29
+1200
+
xorg-server (2:1.17.2-1ubuntu2) wily; urgency=medium
* debian/patches/xmir.patch:
diff --git a/debian/patches/xmir-desktop-file-hint-flag.patch
b/debian/patches/xmir-desktop-file-hint-flag.patch
index 8b3a1dd..7dbc73a 100644
--- a/debian/patches/xmir-desktop-file-hint-flag.patch
+++ b/debian/patches/xmir-desktop-file-hint-flag.patch
@@ -1,4 +1,4 @@
-From cc91948d4be69af96ddf9417a4b3cfac5d0f0f35 Mon Sep 17 00:00:00 2001
+From 938313b76b0e3279a94af931cbe5fd34b8cb580c Mon Sep 17 00:00:00 2001
From: Robert Ancell robert.anc...@canonical.com
Date: Mon, 13 Jul 2015 15:54:32 +1200
Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag required by Unity8
@@ -9,7 +9,7 @@ Subject: [PATCH 3/4] xmir: Ignore --desktop_file_hint flag
required by Unity8
1 file changed, 3 insertions(+)
diff --git a/hw/xmir/xmir.c b/hw/xmir/xmir.c
-index 2a7227e..810b715 100644
+index ef78cca..b9b7f2d 100644
--- a/hw/xmir/xmir.c
+++ b/hw/xmir/xmir.c
@@ -123,6 +123,9 @@ ddxProcessArgument(int argc, char *argv[], int i)
diff --git a/debian/patches/xmir-rootless.patch
b/debian/patches/xmir-rootless.patch
index 4f0196a..b6b7bbd 100644
--- a/debian/patches/xmir-rootless.patch
+++ b/debian/patches/xmir-rootless.patch
@@ -1,4 +1,4 @@
-From 3c705fcf4a68de1276d1a2f6ee176ec7e62eb9df Mon Sep 17 00:00:00 2001
+From 2cf1ea480b7ebcecc61509a54b27b685c4ccfc53 Mon Sep 17 00:00:00 2001
From: Robert Ancell
xterm: Changes to 'pristine-tar'
xterm_319.orig.tar.gz.delta |binary xterm_319.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) New commits: commit 9c5fe5323152f806afe86d5895d2e0a0dc043a27 Author: Sven Joachim svenj...@gmx.de Date: Thu Aug 20 19:54:06 2015 +0200 pristine-tar data for xterm_319.orig.tar.gz diff --git a/xterm_319.orig.tar.gz.delta b/xterm_319.orig.tar.gz.delta new file mode 100644 index 000..6befa5e Binary files /dev/null and b/xterm_319.orig.tar.gz.delta differ diff --git a/xterm_319.orig.tar.gz.id b/xterm_319.orig.tar.gz.id new file mode 100644 index 000..4f84b47 --- /dev/null +++ b/xterm_319.orig.tar.gz.id @@ -0,0 +1 @@ +e96ab2cf4eaf73a102f47751ed91fc1b046b661d
xterm: Changes to 'upstream-unstable'
INSTALL |6
MANIFEST |2
charproc.c | 24 -
configure|6
configure.in |6
ctlseqs.ms | 129 -
ctlseqs.txt | 119 -
fontutils.c | 53 +-
graphics.c | 53 +-
graphics.h |7
graphics_regis.c | 1022 ++-
main.c |7
misc.c | 17
package/debian/changelog |6
package/freebsd/Makefile |2
package/xterm.spec |4
version.h|6
vttests/fonts.sh |7
xterm.h |4
xterm.log.html | 60 ++
xterm.man|6
xtermcfg.hin |3
22 files changed, 1134 insertions(+), 415 deletions(-)
New commits:
commit e27b1046f0ab81daba99fa741507e5bf9826867d
Author: Sven Joachim svenj...@gmx.de
Date: Thu Aug 20 19:54:05 2015 +0200
Imported Upstream version 319
diff --git a/INSTALL b/INSTALL
index 7c4dfd2..f049a7c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.157 2015/04/12 20:44:43 tom Exp $
+-- $XTermId: INSTALL,v 1.158 2015/08/10 23:38:32 tom Exp $
---
-- Copyright 1997-2014,2015 by Thomas E. Dickey
--
@@ -385,14 +385,14 @@ The options (in alphabetic order):
This sets the default resource value, which is shown in the manpage.
- --enable-broken-osc allow broken Linux OSC-strings],
+ --enable-broken-osc allow broken Linux OSC-strings
Compile-in code to accommodate scripts that write Linux's malformed
palette control strings without checking. The result makes xterm
appear to freeze. This workaround makes xterm ignore the strings,
and is compiled-in by default for Linux.
- --enable-builtin-xpms allow broken Linux OSC-strings],
+ --enable-builtin-xpms compile-in icon data
Compile-in X pixmap data for these icons:
filled-xterm
diff --git a/MANIFEST b/MANIFEST
index 455149c..424d573 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-318, version xterm-318
+MANIFEST for xterm-319, version xterm-319
MANIFESTthis file
256colres.h resource-definitions for 256-color mode
diff --git a/charproc.c b/charproc.c
index df6adf4..c331a5f 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1409 2015/04/12 16:57:00 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1413 2015/07/15 09:21:40 tom Exp $ */
/*
* Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -7075,9 +7075,23 @@ RequestResize(XtermWidget xw, int rows, int cols, Bool
text)
TRACE((RequestResize(rows=%d, cols=%d, text=%d)\n, rows, cols, text));
-if ((int) (askedWidth = (Dimension) cols) cols
- || (int) (askedHeight = (Dimension) rows) rows)
- return;
+/* check first if the row/column values fit into a Dimension */
+if (cols 0) {
+ if ((int) (askedWidth = (Dimension) cols) cols) {
+ TRACE((... cols too large for Dimension\n));
+ return;
+ }
+} else {
+ askedWidth = 0;
+}
+if (rows 0) {
+ if ((int) (askedHeight = (Dimension) rows) rows) {
+ TRACE((... rows too large for Dimension\n));
+ return;
+ }
+} else {
+ askedHeight = 0;
+}
if (askedHeight == 0
|| askedWidth == 0
@@ -10921,7 +10935,7 @@ HandleKeymapChange(Widget w,
size_t len;
TRACE((HandleKeymapChange(%#lx, %s)\n,
- w,
+ (unsigned long) w,
(*param_count
? params[0]
: missing)));
diff --git a/configure b/configure
index 39486ea..3919996 100755
--- a/configure
+++ b/configure
@@ -15807,13 +15807,13 @@ if test ${enable_builtin_xpms+set} = set; then
enableval=$enable_builtin_xpms
test $enableval != yes enableval=no
if test $enableval != no ; then
-enable_builtin_xpms=no
- else
enable_builtin_xpms=yes
+ else
+enable_builtin_xpms=no
fi
else
enableval=no
- enable_builtin_xpms=yes
+ enable_builtin_xpms=no
fi;
echo $as_me:15819: result: $enable_builtin_xpms 5
diff --git a/configure.in b/configure.in
index ff5d563..d5139f4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.335 2015/04/12 20:41:52 tom Exp $
+dnl $XTermId: configure.in,v 1.336 2015/08/10 23:45:36 tom Exp $
dnl
dnl
-
dnl this file is part of xterm
@@ -495,8 +495,8 @@ test $enable_broken_st = no
AC_DEFINE(OPT_BROKEN_ST,0,[Define to 0 to disal
AC_MSG_CHECKING(if you want to compile-in icon data)
CF_ARG_ENABLE(builtin-xpms,
[
xserver-xorg-video-ati: Changes to 'debian-unstable'
configure.ac | 53 +-
debian/changelog |6
man/radeon.man| 28 +
src/Makefile.am | 10
src/ati_pciids_gen.h |2
src/drmmode_display.c | 970 +++--
src/drmmode_display.h | 46 +
src/evergreen_accel.c |2
src/pcidb/ati_pciids.csv |2
src/radeon.h | 107 +++-
src/radeon_accel.c|1
src/radeon_bo_helper.c| 135 -
src/radeon_bo_helper.h|6
src/radeon_chipinfo_gen.h |2
src/radeon_chipset_gen.h |2
src/radeon_dri2.c | 695 --
src/radeon_dri2.h | 37 -
src/radeon_dri3.c | 215
src/radeon_drm_queue.c| 181 ++
src/radeon_drm_queue.h| 56 ++
src/radeon_exa.c |1
src/radeon_glamor.c | 121 ++--
src/radeon_glamor.h | 71 +-
src/radeon_glamor_wrappers.c | 994 ++
src/radeon_kms.c | 396 ++-
src/radeon_list.h | 39 +
src/radeon_pci_chipset_gen.h |2
src/radeon_pci_device_match_gen.h |2
src/radeon_present.c | 465 +
src/radeon_probe.c| 11
src/radeon_probe.h|5
src/radeon_sync.c | 145 +
src/radeon_video.c|7
src/radeon_video.h|1
34 files changed, 3983 insertions(+), 833 deletions(-)
New commits:
commit 578aa428eeaad72a9dc25bb04acb0f59cc23d731
Author: Timo Aaltonen tjaal...@debian.org
Date: Thu Aug 20 14:26:42 2015 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 073b9bf..5ce07a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.5.0+git20150819-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot.
+
+ -- Timo Aaltonen tjaal...@debian.org Thu, 20 Aug 2015 14:25:34 +0300
+
xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
[ Andreas Boll ]
commit 0288a4b87b65ba54f37fbeeea3cb32238deee92e
Author: Michel Dänzer michel.daen...@amd.com
Date: Wed Aug 19 16:54:14 2015 +0900
DRI2: Keep MSC monotonic when moving window between CRTCs
This mirrors the DRI3 implementation in xserver. Fixes VDPAU video
playback hanging when moving the window between CRTCs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66384
(Ported from amdgpu commit 63948ea091a9b324327ade7ec4fc5d67ca7e6f6f)
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 09a84b5..b29d88b 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -65,6 +65,28 @@ struct dri2_buffer_priv {
};
+struct dri2_window_priv {
+xf86CrtcPtr crtc;
+int vblank_delta;
+};
+
+#if HAS_DEVPRIVATEKEYREC
+
+static DevPrivateKeyRec dri2_window_private_key_rec;
+#define dri2_window_private_key (dri2_window_private_key_rec)
+
+#else
+
+static int dri2_window_private_key_index;
+DevPrivateKey dri2_window_private_key = dri2_window_private_key_index;
+
+#endif /* HAS_DEVPRIVATEKEYREC */
+
+#define get_dri2_window_priv(window) \
+((struct dri2_window_priv*) \
+ dixLookupPrivate((window)-devPrivates, dri2_window_private_key))
+
+
static PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
{
if (drawable-type == DRAWABLE_PIXMAP)
@@ -554,17 +576,80 @@ radeon_dri2_client_state_changed(CallbackListPtr
*ClientStateCallback, pointer d
}
}
+/*
+ * Get current frame count delta for the specified drawable and CRTC
+ */
+static uint32_t radeon_get_msc_delta(DrawablePtr pDraw, xf86CrtcPtr crtc)
+{
+drmmode_crtc_private_ptr drmmode_crtc = crtc-driver_private;
+
+if (pDraw pDraw-type == DRAWABLE_WINDOW)
+ return drmmode_crtc-interpolated_vblanks +
+ get_dri2_window_priv((WindowPtr)pDraw)-vblank_delta;
+
+return drmmode_crtc-interpolated_vblanks;
+}
+
+/*
+ * Get current frame count and timestamp of the specified CRTC
+ */
+static Bool radeon_dri2_get_crtc_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64
*msc)
+{
+if (!radeon_crtc_is_enabled(crtc) ||
+drmmode_crtc_get_ust_msc(crtc, ust, msc) != Success) {
+ /* CRTC is not running, extrapolate MSC and timestamp */
+ drmmode_crtc_private_ptr drmmode_crtc = crtc-driver_private;
+ ScrnInfoPtr scrn = crtc-scrn;
+ RADEONInfoPtr info = RADEONPTR(scrn);
+ CARD64 now, delta_t, delta_seq;
+
+ if (!drmmode_crtc-dpms_last_ust)
+ return FALSE;
+
+ if (drmmode_get_current_ust(info-dri2.drm_fd, now) != 0) {
+ xf86DrvMsg(scrn-scrnIndex, X_ERROR,
+ %s cannot get current time\n, __func__);
+ return FALSE;
+
xserver-xorg-video-ati: Changes to 'ubuntu'
configure.ac | 53 +- debian/changelog | 19 debian/patches/series |2 debian/patches/xmir.patch | 607 --- man/radeon.man| 28 + src/Makefile.am | 10 src/ati_pciids_gen.h |2 src/drmmode_display.c | 970 +++-- src/drmmode_display.h | 46 + src/evergreen_accel.c |2 src/pcidb/ati_pciids.csv |2 src/radeon.h | 107 +++- src/radeon_accel.c|1 src/radeon_bo_helper.c| 135 - src/radeon_bo_helper.h|6 src/radeon_chipinfo_gen.h |2 src/radeon_chipset_gen.h |2 src/radeon_dri2.c | 695 -- src/radeon_dri2.h | 37 - src/radeon_dri3.c | 215 src/radeon_drm_queue.c| 181 ++ src/radeon_drm_queue.h| 56 ++ src/radeon_exa.c |1 src/radeon_glamor.c | 121 ++-- src/radeon_glamor.h | 71 +- src/radeon_glamor_wrappers.c | 994 ++ src/radeon_kms.c | 396 ++- src/radeon_list.h | 39 + src/radeon_pci_chipset_gen.h |2 src/radeon_pci_device_match_gen.h |2 src/radeon_present.c | 465 + src/radeon_probe.c| 11 src/radeon_probe.h|5 src/radeon_sync.c | 145 + src/radeon_video.c|7 src/radeon_video.h|1 36 files changed, 3997 insertions(+), 1441 deletions(-) New commits: commit 89467bf2c09de5e193a2d2f361fb09a0013612a0 Author: Timo Aaltonen tjaal...@debian.org Date: Thu Aug 20 15:59:55 2015 +0300 release to wily diff --git a/debian/changelog b/debian/changelog index d61bfe5..0b976be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-ati (1:7.5.0+git20150819-0ubuntu1) UNRELEASED; urgency=medium +xserver-xorg-video-ati (1:7.5.0+git20150819-0ubuntu1) wily; urgency=medium * Merge from unreleased Debian git. - -- Timo Aaltonen tjaal...@debian.org Thu, 20 Aug 2015 14:27:02 +0300 + -- Timo Aaltonen tjaal...@debian.org Thu, 20 Aug 2015 15:59:30 +0300 xserver-xorg-video-ati (1:7.5.0+git20150819-1) UNRELEASED; urgency=medium commit 70d1f01945d9966c955d41e95fb53d6799bc87d7 Author: Timo Aaltonen tjaal...@debian.org Date: Thu Aug 20 14:31:08 2015 +0300 import changes from 1:7.5.0-1ubuntu3 diff --git a/debian/changelog b/debian/changelog index eeff0de..d61bfe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,13 @@ xserver-xorg-video-ati (1:7.5.0+git20150819-1) UNRELEASED; urgency=medium -- Timo Aaltonen tjaal...@debian.org Thu, 20 Aug 2015 14:25:34 +0300 +xserver-xorg-video-ati (1:7.5.0-1ubuntu3) wily; urgency=medium + + * debian/patches/xmir.patch: +- Drop XMir patch, we don't need it with new glamor based XMir (LP: #1462994) + + -- Robert Ancell robert.anc...@canonical.com Tue, 09 Jun 2015 15:16:34 +1200 + xserver-xorg-video-ati (1:7.5.0-1ubuntu2) vivid; urgency=medium * Bump build-depends to xorg 1.17. diff --git a/debian/patches/series b/debian/patches/series index 51683fa..a82d1b4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -xmir.patch +#placeholder diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch deleted file mode 100644 index fe8489a..000 --- a/debian/patches/xmir.patch +++ /dev/null @@ -1,607 +0,0 @@ -commit 8f7b9d5d20e8fe9dd718d0ab1d82a21dbbcd215d -Author: Christopher James Halse Rogers r...@ubuntu.com -Date: Mon Jul 22 17:02:17 2013 +1000 - -radeon/kms: Support running nested in a Mir compositor - -Signed-off-by: Christopher James Halse Rogers r...@ubuntu.com - a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -1958,7 +1958,7 @@ - if (!miCreateDefColormap(pScreen)) - return FALSE; - /* all radeons support 10 bit CLUTs */ -- if (!xf86HandleColormaps(pScreen, 256, 10, -+ if (!xorgMir !xf86HandleColormaps(pScreen, 256, 10, -drmmode_load_palette, NULL, -CMAP_PALETTED_TRUECOLOR - #if 0 /* This option messes up text mode! (e...@suse.de) */ a/src/radeon.h -+++ b/src/radeon.h -@@ -87,6 +87,18 @@ - #include picturestr.h - #endif - -+#ifdef XMIR -+#include xmir.h -+#include xf86Priv.h -+#else -+#define xorgMir 0 -+typedef struct xmir_screen xmir_screen; -+typedef struct xmir_window xmir_window; -+void xmir_screen_for_each_damaged_window(void *, void *); -+int xmir_get_drm_fd(const char *busid); -+void xmir_screen_init(ScreenPtr screen, void *); -+#endif -+ - #include compat-api.h - - #include simple_list.h -@@ -480,9
xserver-xorg-video-ati: Changes to 'upstream-unstable'
configure.ac | 53 +-
man/radeon.man| 28 +
src/Makefile.am | 10
src/ati_pciids_gen.h |2
src/drmmode_display.c | 970 +++--
src/drmmode_display.h | 46 +
src/evergreen_accel.c |2
src/pcidb/ati_pciids.csv |2
src/radeon.h | 107 +++-
src/radeon_accel.c|1
src/radeon_bo_helper.c| 135 -
src/radeon_bo_helper.h|6
src/radeon_chipinfo_gen.h |2
src/radeon_chipset_gen.h |2
src/radeon_dri2.c | 695 --
src/radeon_dri2.h | 37 -
src/radeon_dri3.c | 215
src/radeon_drm_queue.c| 181 ++
src/radeon_drm_queue.h| 56 ++
src/radeon_exa.c |1
src/radeon_glamor.c | 121 ++--
src/radeon_glamor.h | 71 +-
src/radeon_glamor_wrappers.c | 994 ++
src/radeon_kms.c | 396 ++-
src/radeon_list.h | 39 +
src/radeon_pci_chipset_gen.h |2
src/radeon_pci_device_match_gen.h |2
src/radeon_present.c | 465 +
src/radeon_probe.c| 11
src/radeon_probe.h|5
src/radeon_sync.c | 145 +
src/radeon_video.c|7
src/radeon_video.h|1
33 files changed, 3977 insertions(+), 833 deletions(-)
New commits:
commit 0288a4b87b65ba54f37fbeeea3cb32238deee92e
Author: Michel Dänzer michel.daen...@amd.com
Date: Wed Aug 19 16:54:14 2015 +0900
DRI2: Keep MSC monotonic when moving window between CRTCs
This mirrors the DRI3 implementation in xserver. Fixes VDPAU video
playback hanging when moving the window between CRTCs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66384
(Ported from amdgpu commit 63948ea091a9b324327ade7ec4fc5d67ca7e6f6f)
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 09a84b5..b29d88b 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -65,6 +65,28 @@ struct dri2_buffer_priv {
};
+struct dri2_window_priv {
+xf86CrtcPtr crtc;
+int vblank_delta;
+};
+
+#if HAS_DEVPRIVATEKEYREC
+
+static DevPrivateKeyRec dri2_window_private_key_rec;
+#define dri2_window_private_key (dri2_window_private_key_rec)
+
+#else
+
+static int dri2_window_private_key_index;
+DevPrivateKey dri2_window_private_key = dri2_window_private_key_index;
+
+#endif /* HAS_DEVPRIVATEKEYREC */
+
+#define get_dri2_window_priv(window) \
+((struct dri2_window_priv*) \
+ dixLookupPrivate((window)-devPrivates, dri2_window_private_key))
+
+
static PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
{
if (drawable-type == DRAWABLE_PIXMAP)
@@ -554,17 +576,80 @@ radeon_dri2_client_state_changed(CallbackListPtr
*ClientStateCallback, pointer d
}
}
+/*
+ * Get current frame count delta for the specified drawable and CRTC
+ */
+static uint32_t radeon_get_msc_delta(DrawablePtr pDraw, xf86CrtcPtr crtc)
+{
+drmmode_crtc_private_ptr drmmode_crtc = crtc-driver_private;
+
+if (pDraw pDraw-type == DRAWABLE_WINDOW)
+ return drmmode_crtc-interpolated_vblanks +
+ get_dri2_window_priv((WindowPtr)pDraw)-vblank_delta;
+
+return drmmode_crtc-interpolated_vblanks;
+}
+
+/*
+ * Get current frame count and timestamp of the specified CRTC
+ */
+static Bool radeon_dri2_get_crtc_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64
*msc)
+{
+if (!radeon_crtc_is_enabled(crtc) ||
+drmmode_crtc_get_ust_msc(crtc, ust, msc) != Success) {
+ /* CRTC is not running, extrapolate MSC and timestamp */
+ drmmode_crtc_private_ptr drmmode_crtc = crtc-driver_private;
+ ScrnInfoPtr scrn = crtc-scrn;
+ RADEONInfoPtr info = RADEONPTR(scrn);
+ CARD64 now, delta_t, delta_seq;
+
+ if (!drmmode_crtc-dpms_last_ust)
+ return FALSE;
+
+ if (drmmode_get_current_ust(info-dri2.drm_fd, now) != 0) {
+ xf86DrvMsg(scrn-scrnIndex, X_ERROR,
+ %s cannot get current time\n, __func__);
+ return FALSE;
+ }
+
+ delta_t = now - drmmode_crtc-dpms_last_ust;
+ delta_seq = delta_t * drmmode_crtc-dpms_last_fps;
+ delta_seq /= 100;
+ *ust = drmmode_crtc-dpms_last_ust;
+ delta_t = delta_seq * 100;
+ delta_t /= drmmode_crtc-dpms_last_fps;
+ *ust += delta_t;
+ *msc = drmmode_crtc-dpms_last_seq;
+ *msc += delta_seq;
+}
+
+return TRUE;
+}
+
static
xf86CrtcPtr radeon_dri2_drawable_crtc(DrawablePtr pDraw, Bool
consider_disabled)
{
ScreenPtr pScreen = pDraw-pScreen;
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+xf86CrtcPtr
Bug#794212: xserver-xorg: segfault in DRI2SwapBuffers+0x1d0 on intel hardware
I am seeing the same crash with the same backtrace: [512937.361] (II) intel(0): resizing framebuffer to 1600x900 [512937.365] (II) intel(0): switch to mode 1600x900@60.0 on LVDS1 using pipe 0, position (0, 0), rotation normal, reflection none [642161.462] (EE) [642161.465] (EE) Backtrace: [642161.475] (EE) 0: /usr/bin/X (xorg_backtrace+0x56) [0x7f2332fa6df6] [642161.476] (EE) 1: /usr/bin/X (0x7f2332df4000+0x1b7009) [0x7f2332fab009] [642161.476] (EE) 2: /lib/x86_64-linux-gnu/libc.so.6 (0x7f2330cf3000+0x35180) [0x7f2330d28180] [642161.476] (EE) 3: /usr/lib/xorg/modules/drivers/intel_drv.so (0x7f232ca95000+0x5e2aa) [0x7f232caf32aa] [642161.476] (EE) 4: /usr/lib/xorg/modules/drivers/intel_drv.so (0x7f232ca95000+0xf6cd2) [0x7f232cb8bcd2] [642161.476] (EE) 5: /usr/lib/xorg/modules/drivers/intel_drv.so (0x7f232ca95000+0x10ba30) [0x7f232cba0a30] [642161.476] (EE) 6: /usr/lib/xorg/modules/drivers/intel_drv.so (0x7f232ca95000+0x10ce3c) [0x7f232cba1e3c] [642161.476] (EE) 7: /usr/lib/xorg/modules/drivers/intel_drv.so (0x7f232ca95000+0x10d828) [0x7f232cba2828] [642161.476] (EE) 8: /usr/bin/X (DRI2SwapBuffers+0x1d0) [0x7f2332f797a0] [642161.476] (EE) 9: /usr/bin/X (0x7f2332df4000+0x18711c) [0x7f2332f7b11c] [642161.476] (EE) 10: /usr/bin/X (0x7f2332df4000+0x58117) [0x7f2332e4c117] [642161.476] (EE) 11: /usr/bin/X (0x7f2332df4000+0x5c29b) [0x7f2332e5029b] [642161.476] (EE) 12: /lib/x86_64-linux-gnu/libc.so.6 (__libc_start_main+0xf5) [0x7f2330d14b45] [642161.476] (EE) 13: /usr/bin/X (0x7f2332df4000+0x4668e) [0x7f2332e3a68e] [642161.476] (EE) [642161.476] (EE) Segmentation fault at address 0x7f233324b000 [642161.476] (EE) Fatal server error: [642161.476] (EE) Caught signal 11 (Segmentation fault). Server aborting [642161.476] (EE) [642161.476] (EE) I sometimes use multiple monitors, like OP, but this crash seems to be far removed from that. Both times I've seen this crash I've been using Google Chrome. MM
