xorg-server: Changes to 'debian-unstable'
debian/changelog | 11 +
debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff | 36
+++
debian/patches/os-treat-ssh-as-a-non-local-client.diff| 97
++
debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff | 35
+++
debian/patches/revert-eb5108b870.diff | 35
---
debian/patches/series |5
6 files changed, 183 insertions(+), 36 deletions(-)
New commits:
commit fe1d88778d3940550f30b85a7323fc1e3935eaaa
Author: Timo Aaltonen
Date: Tue Mar 29 10:39:02 2016 +0300
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 2374ba2..9169531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium
+xorg-server (2:1.18.2-3) unstable; urgency=medium
* regression fixes part2:
- replace revert-eb5108b870.diff with patch from upstream
@@ -7,7 +7,7 @@ xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium
* os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work
with DRI3.
- -- Timo Aaltonen Tue, 29 Mar 2016 10:16:23 +0300
+ -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300
xorg-server (2:1.18.2-2) unstable; urgency=medium
commit 99ea495eaeacfcbe5defa412d6922a0966c27c3a
Author: Timo Aaltonen
Date: Tue Mar 29 10:34:50 2016 +0300
more regression fixes, plus fix remote clients with DRI3
diff --git a/debian/changelog b/debian/changelog
index 24902b1..2374ba2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium
+
+ * regression fixes part2:
+- replace revert-eb5108b870.diff with patch from upstream
+- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an
+ extra cursor in some cases
+ * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work
+with DRI3.
+
+ -- Timo Aaltonen Tue, 29 Mar 2016 10:16:23 +0300
+
xorg-server (2:1.18.2-2) unstable; urgency=medium
* regression fixes/workarounds:
diff --git a/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff
b/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff
new file mode 100644
index 000..4e1b26b
--- /dev/null
+++ b/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff
@@ -0,0 +1,36 @@
+commit 418fe365b45a143680d3b4143dc60f7cdc5a3507
+Author: Michel Dänzer
+Date: Thu Mar 24 17:34:23 2016 +0900
+
+xfree86/modes: Make sure the HW cursor is hidden when it should be
+
+When the HW cursor is hidden (e.g. because xf86CursorResetCursor
+triggers a switch from HW cursor to SW cursor), the driver isn't
+notified of this for disabled CRTCs. If the HW cursor was shown when the
+CRTC was disabled, it may still be displayed when the CRTC is enabled
+again.
+
+Prevent this by explicitly hiding the HW cursor again after setting a
+mode if it's currently supposed to be hidden.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560
+Reviewed-by: Adam Jackson
+Signed-off-by: Michel Dänzer
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 2639a30..6091b5e 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
b/hw/xfree86/modes/xf86Crtc.c
+@@ -368,6 +368,12 @@ xf86CrtcSetModeTransform(xf86CrtcPtr crtc, DisplayModePtr
mode,
+ xf86CrtcSetScreenSubpixelOrder(scrn->pScreen);
+ if (scrn->ModeSet)
+ scrn->ModeSet(scrn);
++
++/* Make sure the HW cursor is hidden if it's supposed to be, in case
++ * it was hidden while the CRTC was disabled
++ */
++if (!xf86_config->cursor_on)
++xf86_hide_cursors(scrn);
+ }
+ else {
+ crtc->x = saved_x;
diff --git a/debian/patches/os-treat-ssh-as-a-non-local-client.diff
b/debian/patches/os-treat-ssh-as-a-non-local-client.diff
new file mode 100644
index 000..0b879bf
--- /dev/null
+++ b/debian/patches/os-treat-ssh-as-a-non-local-client.diff
@@ -0,0 +1,97 @@
+commit adefbaee499b9679c6cac21f52ec6545af2b36b5
+Author: Adam Jackson
+Date: Mon Mar 28 18:11:09 2016 +0900
+
+os: Treat ssh as a non-local client (v4)
+
+By the time we get to ComputeLocalClient, we've already done
+NextAvailableClient → ReserveClientIds → DetermineClientCmd (assuming
+we're built with #define CLIENTIDS), so we can look up the name of the
+client process and refuse to treat ssh's X forwarding as if it were
+local.
+
+v2: (Michel Dänzer)
+* Only match "ssh" itself, not other executable names starting with
+ that prefix.
+* Ignore executable path for the match.
+v3: (Michel Dänzer)
+* Use GetClientCmdName (Mark Kettenis)
+* Perform check on Windows as well, but only ignore path on Cygwin
+ (Martin Peres, Emil Velikov, Jon T
Processing of xorg-server_1.18.2-3_source.changes
xorg-server_1.18.2-3_source.changes uploaded successfully to localhost along with the files: xorg-server_1.18.2-3.dsc xorg-server_1.18.2-3.diff.gz Greetings, Your Debian queue daemon (running on host franck.debian.org)
xorg-server: Changes to 'refs/tags/xorg-server-2_1.18.2-3'
Tag 'xorg-server-2_1.18.2-3' created by Timo Aaltonen at 2016-03-29 07:39 + Tagging upload of xorg-server 2:1.18.2-3 to unstable. -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJW+jEaAAoJEMtwMWWoiYTck4kP/ifJDot2zKy7pvimTx2dJKbM RKuHF+/4WE/bLfPR+/TN7vSp40+nUAjI/tBdAxXnaFcXBIKT3UH6hi2IVFWP0nzh 9ECIE1Gwr/FY5Ud3V/p/MdL8hV3eN6nffqdpeJP2aE8AgIrEYNXH2U4UZ4Kc6vYp hQIEM6az4kX6rsPC5AiN6+B4xLwA+pn7QxbEWAiKMHWu/2No8GIsd1eh7C8Etp/n rQk5+ob93zDOvsFX3dmVumdA+v9koDUPs2vXkbYNUG6DehNqBOI8O+KTQ5uJMUox NveMhZaEgvPsaiKDDXVur4UYfAdd7awUy3k9D1B39IHBrnrKooIMJcfz40OJ7u6V LXFaveaBSZ4dIgFndz8ExzTcMNrZ6UZMWIMJv+yfUIleHSHVsg0IMaa0orxsL76U 63DClmDF3KCTIwCeLsVx2sANT2wKUjmxm9lQu2kj2rC77ShtT6Omu7S5IZgvIhbl j+ahesFK3ifhP3PDBLpsuaqRzP0Hn07geGrnrTSoJ4Ym29asCMCmJP/T41rjQORr posPqpD3KixjwEaxjtEuz8OqpoYO3XtyWq0G9FQbuMP+/twVlGEeSXTjJHXKvCEK b4iFHt2eaBeMaTaQBh9SfBX4/QzYDVcPjM81IpCiB/e9w/nLT+BUkO96TZhl9kCj 7R5QVXJnYXn508sCYzpN =L/pw -END PGP SIGNATURE- Changes since xorg-server-2_1.18.2-2: Timo Aaltonen (2): more regression fixes, plus fix remote clients with DRI3 release to unstable --- debian/changelog | 11 + debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff | 36 +++ debian/patches/os-treat-ssh-as-a-non-local-client.diff| 97 ++ debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff | 35 +++ debian/patches/revert-eb5108b870.diff | 35 --- debian/patches/series |5 6 files changed, 183 insertions(+), 36 deletions(-) ---
xorg-server: Changes to 'ubuntu'
debian/changelog | 22 debian/patches/glamor-swizzle-red-to-0-for-alpha-textures.diff| 31 debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff | 36 debian/patches/os-treat-ssh-as-a-non-local-client.diff| 97 ++ debian/patches/present-only-requeue-for-next-msc-after-flip-fail.diff | 35 debian/patches/series |8 debian/patches/vidmode-reduce-verbosity-of-getmodeline.diff | 372 ++ 7 files changed, 600 insertions(+), 1 deletion(-) New commits: commit f490b1a14ae0b562fcce67b2daac7656a906ff83 Author: Timo Aaltonen Date: Tue Mar 29 10:46:07 2016 +0300 update changelog diff --git a/debian/changelog b/debian/changelog index 0e160a0..7615660 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,4 @@ -xorg-server (2:1.18.2-3) unstable; urgency=medium - - * regression fixes part2: -- replace revert-eb5108b870.diff with patch from upstream -- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an - extra cursor in some cases - * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work -with DRI3. - - -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 - -xorg-server (2:1.18.2-2ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.18.2-3ubuntu1) UNRELEASED; urgency=medium * Merge from Debian. * fix-xineramaqueryscreens-for-reverse-prime.diff, @@ -22,6 +11,17 @@ xorg-server (2:1.18.2-2ubuntu1) UNRELEASED; urgency=medium -- Timo Aaltonen Sat, 12 Mar 2016 08:59:43 +0200 +xorg-server (2:1.18.2-3) unstable; urgency=medium + + * regression fixes part2: +- replace revert-eb5108b870.diff with patch from upstream +- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an + extra cursor in some cases + * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work +with DRI3. + + -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 + xorg-server (2:1.18.2-2) unstable; urgency=medium * regression fixes/workarounds: commit fe1d88778d3940550f30b85a7323fc1e3935eaaa Author: Timo Aaltonen Date: Tue Mar 29 10:39:02 2016 +0300 release to unstable diff --git a/debian/changelog b/debian/changelog index 2374ba2..9169531 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium +xorg-server (2:1.18.2-3) unstable; urgency=medium * regression fixes part2: - replace revert-eb5108b870.diff with patch from upstream @@ -7,7 +7,7 @@ xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work with DRI3. - -- Timo Aaltonen Tue, 29 Mar 2016 10:16:23 +0300 + -- Timo Aaltonen Tue, 29 Mar 2016 10:38:47 +0300 xorg-server (2:1.18.2-2) unstable; urgency=medium commit 99ea495eaeacfcbe5defa412d6922a0966c27c3a Author: Timo Aaltonen Date: Tue Mar 29 10:34:50 2016 +0300 more regression fixes, plus fix remote clients with DRI3 diff --git a/debian/changelog b/debian/changelog index 24902b1..2374ba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xorg-server (2:1.18.2-3) UNRELEASED; urgency=medium + + * regression fixes part2: +- replace revert-eb5108b870.diff with patch from upstream +- make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an + extra cursor in some cases + * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work +with DRI3. + + -- Timo Aaltonen Tue, 29 Mar 2016 10:16:23 +0300 + xorg-server (2:1.18.2-2) unstable; urgency=medium * regression fixes/workarounds: diff --git a/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff b/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff new file mode 100644 index 000..4e1b26b --- /dev/null +++ b/debian/patches/make-sure-hw-cursor-is-hidden-when-it-should.diff @@ -0,0 +1,36 @@ +commit 418fe365b45a143680d3b4143dc60f7cdc5a3507 +Author: Michel Dänzer +Date: Thu Mar 24 17:34:23 2016 +0900 + +xfree86/modes: Make sure the HW cursor is hidden when it should be + +When the HW cursor is hidden (e.g. because xf86CursorResetCursor +triggers a switch from HW cursor to SW cursor), the driver isn't +notified of this for disabled CRTCs. If the HW cursor was shown when the +CRTC was disabled, it may still be displayed when the CRTC is enabled +again. + +Prevent this by explicitly hiding the HW cursor again after setting a +mode if it's currently supposed to be hidden. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560 +Reviewed-by: Adam Jackson +Signed-off-by: Michel Dänzer + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 2639a30..6091b5e 100644 +--- a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +@@ -368,6 +368,12 @@ xf86CrtcSet
xorg-server_1.18.2-3_source.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Tue, 29 Mar 2016 10:38:47 +0300 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 Version: 2:1.18.2-3 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Timo Aaltonen 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.18.2-3) unstable; urgency=medium . * regression fixes part2: - replace revert-eb5108b870.diff with patch from upstream - make-sure-hw-cursor-is-hidden-when-it-should.diff: Don't show an extra cursor in some cases * os-treat-ssh-as-a-non-local-client.diff: Allow remote clients to work with DRI3. Checksums-Sha1: bac559c065cde4a2cc5f8ae25cf9a300f6fd4f0c 4832 xorg-server_1.18.2-3.dsc 88fde1e39f80a7530707fde8b366e33eb7ef0998 178601 xorg-server_1.18.2-3.diff.gz Checksums-Sha256: 06316c0f5459bc2aff2fafbe1e188943c71f952dd91fa2ceb479bf7602a3e440 4832 xorg-server_1.18.2-3.dsc 87eace1024599694d744de93395f2d35db51e1d1796fa435d75d9752abe0c19c 178601 xorg-server_1.18.2-3.diff.gz Files: 6352a5164e1e28c16f79843077be1c18 4832 x11 optional xorg-server_1.18.2-3.dsc a729bdc3f422e4733dd78d036a6bae74 178601 x11 optional xorg-server_1.18.2-3.diff.gz -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBAgAGBQJW+jImAAoJEMtwMWWoiYTcWFgP+wc+KIE3GquIaSfEcrUvmxXO opUnR2lzVOq1d0KCgAy5ekK64Yk8hCYkJtXb/rYRe3USg19rKttbCw4QT/iC2bky S8DZS5MwjNGY63IkRM5Dl7QShSDeMqN+GiL2qEiVJuyNxN3M2l2RPxsO3yewPt8M c503tKuGpeZc+PBENqNbrAbH/DzcWr9CCWlo5U5KcoyZ1NHP6m9p9KDxrcpGpj78 tGS+cg8TPIAVtysY32LaRvpWtwrmnWWQaQO1pxrJd5X5PCXJ5rvtZiJTEc/roicE PviFJbt5NtlwfZ1fTY4T/HRDYpRnCCQyv7Tb/IAt9hdCP1j4MjccT2uRs1SlSyRc ZvKMNEH9SLFND5y9s4s2u15lqyyY9dWQfrV4WmslhDToUlErvkfoDnqZHiW+hs2f +QV+ibDxRorNUuGN2eT3AvCTdZZ855B4qjsDM1eeNFCaUyViXumCt8HUWSw5sTR/ AQ2I9UjFlmOaWzGlHsq2L0ioeJsUzTTW284RDd2YddxoOo9Wy/mc6cYjO7PWuFQu G3TcdR1bSsgKBhOpLyNtA/G4yzP3gm8WPXZLwNgkmMX2lHRwYdaFC6EYjyZaZu1M hERSnO57PcnbcUEbk0A/P3cQNmz7+PQLsqwKR9jEFDXiMv0qHh1qwa37lF944WE7 KC8C/q9dT+1PvlkSP3wE =jS1y -END PGP SIGNATURE- Thank you for your contribution to Debian.
xserver-xorg-video-intel: Changes to 'debian-experimental'
configure.ac |2
debian/changelog |5 -
debian/control |3
src/i915_pciids.h| 13 ++-
src/sna/kgem.c | 13 +++
src/sna/sna_damage.h |5 -
src/sna/sna_display.c| 28 ++
src/sna/sna_dri2.c | 53 +---
src/sna/sna_video.h | 22 +
src/sna/sna_video_overlay.c | 10 --
src/sna/sna_video_sprite.c | 10 --
src/sna/sna_video_textured.c |7 -
tools/virtual.c | 179 +--
13 files changed, 303 insertions(+), 47 deletions(-)
New commits:
commit 985c196d7af84e1fd1615eb397efc2513d9c5831
Author: Timo Aaltonen
Date: Wed Jan 27 14:22:54 2016 +0200
control: Update description to mention that this driver is deprecated in
favor of -modesetting.
diff --git a/debian/changelog b/debian/changelog
index 8920b82..c4d566a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xserver-xorg-video-intel (2:2.99.917+git20160127-1~exp1)
UNRELEASED; urgency=med
* New upstream snapshot.
* control: Document build-depends for dri3info and tests, benchmarks.
+ * control: Update description to mention that this driver is
+deprecated in favor of -modesetting.
-- Timo Aaltonen Wed, 20 Jan 2016 15:27:15 +0200
diff --git a/debian/control b/debian/control
index 96bd8f8..79d83a2 100644
--- a/debian/control
+++ b/debian/control
@@ -73,6 +73,9 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
for i810/i815 and i9xx and newer chipsets.
.
This package is built from the X.org xf86-video-intel driver module.
+ .
+ This driver is deprecated in favor of the server builtin modesetting
+ driver.
Package: xserver-xorg-video-intel-dbg
Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32
commit f26ece922d1d262392ed5ad4000dc256d935fb48
Author: Timo Aaltonen
Date: Wed Jan 27 13:48:17 2016 +0200
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 5f96d46..8920b82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp2) UNRELEASED;
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160127-1~exp1) UNRELEASED;
urgency=medium
+ * New upstream snapshot.
* control: Document build-depends for dri3info and tests, benchmarks.
-- Timo Aaltonen Wed, 20 Jan 2016 15:27:15 +0200
commit 7817949314a21293c8bc34dec214b42932b19aaf
Author: Chris Wilson
Date: Wed Jan 27 10:54:46 2016 +
sna/dri2: Avoiding marking a pending-signal on a dead Drawable
If the Drawable is gone, we cannot send it a frame-complete signal, and
in particular we cannot continue the pending flip-chain.
References: https://bugs.freedesktop.org/show_bug.cgi?id=93844
Signed-off-by: Chris Wilson
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index f2f4908..045b12d 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -2787,6 +2787,9 @@ sna_dri2_flip_continue(struct sna_dri2_event *info)
info->type = info->flip_continue;
info->flip_continue = 0;
+ if (info->draw == NULL)
+ return false;
+
if (info->sna->mode.front_active == 0)
return false;
@@ -2801,6 +2804,7 @@ sna_dri2_flip_continue(struct sna_dri2_event *info)
info->sna->dri2.flip_pending == info);
info->sna->dri2.flip_pending = info;
info->queued = true;
+ assert(info->draw);
info->signal = info->type == FLIP_THROTTLE;
return true;
@@ -3097,6 +3101,7 @@ sna_dri2_schedule_flip(ClientPtr client, DrawablePtr
draw, xf86CrtcPtr crtc,
assert(info->crtc == crtc);
info->event_complete = func;
info->event_data = data;
+ assert(info->draw);
info->signal = true;
info->front = sna_dri2_reference_buffer(front);
@@ -3133,6 +3138,7 @@ new_back:
sna_dri2_get_back(sna, draw, back);
DBG(("%s: fake triple buffering, unblocking client\n",
__FUNCTION__));
frame_swap_complete(info, DRI2_EXCHANGE_COMPLETE);
+ assert(info->draw);
info->signal = signal;
if (info->type == FLIP_ASYNC)
sna_dri2_event_free(info);
@@ -3156,6 +3162,7 @@ queue:
assert(info->crtc == crtc);
info->event_complete = func;
info->event_data = data;
+ assert(info->draw);
info->signal = true;
info->type = FLIP;
@@ -3312,6 +3319,7 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr
draw, DRI2BufferPtr front,
assert(info->crtc == crtc);
info->event_complete = func;
info->event_data = data;
+ assert(info->draw);
info->signal = true;
info->front = sna_dri2_reference_buffer(front
xserver-xorg-video-intel: Changes to 'pristine-tar'
xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.delta |binary xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.id|1 + xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.delta |binary xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.id|1 + 4 files changed, 2 insertions(+) New commits: commit 9b26572f7071c725265ba89b65697f743284901e Author: Timo Aaltonen Date: Tue Mar 29 10:55:29 2016 +0300 pristine-tar data for xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz diff --git a/xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.delta b/xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.delta new file mode 100644 index 000..2696cb7 Binary files /dev/null and b/xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.delta differ diff --git a/xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.id b/xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.id new file mode 100644 index 000..dc07f5d --- /dev/null +++ b/xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz.id @@ -0,0 +1 @@ +3ac981b470108286e36f7b48a261e8a149e22b7b commit 535fb9a3d05eb5b1ae612f54a1daf69cfba51054 Author: Timo Aaltonen Date: Tue Mar 8 15:12:11 2016 +0200 pristine-tar data for xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz diff --git a/xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.delta b/xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.delta new file mode 100644 index 000..3c44ed5 Binary files /dev/null and b/xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.delta differ diff --git a/xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.id b/xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.id new file mode 100644 index 000..1c903b5 --- /dev/null +++ b/xserver-xorg-video-intel_2.99.917+git20160307.orig.tar.gz.id @@ -0,0 +1 @@ +bc8922d0a1378a8bc7409f76eb984b5031d6ddc5
xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 41 +++ debian/control |5 debian/patches/series |8 debian/patches/sna-let-modesetting-handle-gen9+.diff | 40 +++ debian/rules |5 debian/xserver-xorg-video-intel.install|4 debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |4 debian/xserver-xorg-video-intel.install.kfreebsd-i386 |4 src/sna/kgem.h |1 src/sna/sna_display.c | 22 + src/sna/sna_dri2.c | 212 ++--- 11 files changed, 256 insertions(+), 90 deletions(-) New commits: commit f11e4a0a3fd8192b234872f067e06e545e4218ac Author: Timo Aaltonen Date: Sat Mar 12 12:04:46 2016 +0200 update changelog diff --git a/debian/changelog b/debian/changelog index ccf6de6..895ff6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-intel (2:2.99.917+git20160307-2ubuntu1) UNRELEASED; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen Sat, 12 Mar 2016 12:04:17 +0200 + xserver-xorg-video-intel (2:2.99.917+git20160307-2) unstable; urgency=medium * Disable the patch to use modesetting on skylake for now, since it reveals commit a9e817500aafb7829bf154d7754de9b8d0b8e452 Author: Timo Aaltonen Date: Thu Mar 10 22:55:33 2016 +0200 disable patch, upload to unstable diff --git a/debian/changelog b/debian/changelog index 0f715a8..f620743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.99.917+git20160307-2) unstable; urgency=medium + + * Disable the patch to use modesetting on skylake for now, since it reveals +modeset/server bugs. (Closes: #817784) + + -- Timo Aaltonen Thu, 10 Mar 2016 22:16:19 +0200 + xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium [ Timo Aaltonen ] diff --git a/debian/patches/series b/debian/patches/series index aa08141..7658835 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -sna-let-modesetting-handle-gen9+.diff +#sna-let-modesetting-handle-gen9+.diff commit e415f62c90247e917ab91cde9f6138993031abcd Author: Timo Aaltonen Date: Wed Mar 9 21:26:39 2016 +0200 upload to unstable diff --git a/debian/changelog b/debian/changelog index de35387..0f715a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium [ Timo Aaltonen ] * New upstream snapshot. @@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium * Move the shared libraries into multiarch libdir. * rules: Enable parallel builds. - -- Timo Aaltonen Mon, 07 Mar 2016 15:20:56 +0200 + -- Timo Aaltonen Wed, 09 Mar 2016 21:26:17 +0200 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium commit 86ccd6b3b1759c62cb0299a1177ce4f785a928bc Author: Timo Aaltonen Date: Tue Mar 8 15:27:00 2016 +0200 release to unstable diff --git a/debian/changelog b/debian/changelog index de35387..0fc87e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium [ Timo Aaltonen ] * New upstream snapshot. @@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium * Move the shared libraries into multiarch libdir. * rules: Enable parallel builds. - -- Timo Aaltonen Mon, 07 Mar 2016 15:20:56 +0200 + -- Timo Aaltonen Tue, 08 Mar 2016 15:26:40 +0200 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium commit 41b55d35b89467827fa00498726a69cf62de2d09 Author: Timo Aaltonen Date: Tue Mar 8 15:26:32 2016 +0200 rules: Enable parallel builds. diff --git a/debian/changelog b/debian/changelog index 238588b..de35387 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium [ Matthias Klose ] * Move the shared libraries into multiarch libdir. + * rules: Enable parallel builds. -- Timo Aaltonen Mon, 07 Mar 2016 15:20:56 +0200 diff --git a/debian/rules b/debian/rules index 8e907f5..3020c64 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ override_dh_installchangelogs: dh_installchangelogs debian/upstream.changelog %: - dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ + dh $@ --parallel --with quilt,autoreconf,xsf --builddirectory=build/ # Snapshots should only target experimental: generate-snapshot: UPSTREAM_VERS
xserver-xorg-video-intel: Changes to 'debian-unstable'
Makefile.am|4
debian/changelog |6 +
src/i915_pciids.h |6 -
src/sna/kgem.c | 20 +++
src/sna/kgem.h |1
src/sna/sna.h |2
src/sna/sna_accel.c|1
src/sna/sna_display.c | 10 +
src/sna/sna_display_fake.c |4
src/sna/sna_dri2.c | 121 +++-
src/sna/sna_present.c | 110 +-
src/sna/xassert.h | 21 ++-
src/uxa/intel_uxa.c|6 -
test/dri2-race.c | 264 -
test/present-speed.c | 54 +
test/present-test.c| 255 +--
tools/cursor.c | 16 ++
17 files changed, 759 insertions(+), 142 deletions(-)
New commits:
commit 8dee4e4b8ad76371fd754bd24a9d3467d8d8f326
Author: Timo Aaltonen
Date: Tue Mar 29 10:54:53 2016 +0300
release to unstable
diff --git a/debian/changelog b/debian/changelog
index f620743..ddbc0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20160325-1) unstable; urgency=medium
+
+ * New upstream snapshot.
+
+ -- Timo Aaltonen Tue, 29 Mar 2016 10:29:35 +0300
+
xserver-xorg-video-intel (2:2.99.917+git20160307-2) unstable; urgency=medium
* Disable the patch to use modesetting on skylake for now, since it reveals
commit 094924f7f882da1f32395d4c982db6ad8e0f609f
Author: Chris Wilson
Date: Fri Mar 25 20:59:48 2016 +
tools/cursor: Print an ASCII representation as well
Show the ASCII outline of the cursor as well as the image stored in the
PNG.
Signed-off-by: Chris Wilson
diff --git a/tools/cursor.c b/tools/cursor.c
index 6f4e3f8..6a2438a 100644
--- a/tools/cursor.c
+++ b/tools/cursor.c
@@ -61,6 +61,22 @@ int main(int argc, char **argv)
cur->width, cur->height,
cur->xhot, cur->yhot);
+ if (1) {
+ int x, y;
+
+ src = cur->pixels;
+ for (y = 0; y < cur->height; y++) {
+ for (x = 0; x < cur->width; x++) {
+ if (x == cur->xhot && y == cur->yhot)
+ printf("+");
+ else
+ printf("%c", *src ? *src >> 24 >= 127 ?
'x' : '.' : ' ');
+ src++;
+ }
+ printf("\n");
+ }
+ }
+
file = fopen("cursor.png", "wb");
if (file == NULL)
return 2;
commit 39fbae3c61cc2d78ac5e7c5c471d161fafd53400
Author: Chris Wilson
Date: Thu Mar 24 22:09:48 2016 +
Update i915_pciids.h
Sync with kernel commit 7157bb27e79875db5603aa1e30f56e873a8300f9
Author: Michał Winiarski
Date: Fri Feb 5 13:21:42 2016 +0100
drm/i915/skl: Add missing SKL ids
Signed-off-by: Chris Wilson
diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index f970209..9094599 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -277,7 +277,9 @@
INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */
#define INTEL_SKL_GT3_IDS(info) \
+ INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
+ INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */
@@ -296,7 +298,9 @@
#define INTEL_BXT_IDS(info) \
INTEL_VGA_DEVICE(0x0A84, info), \
INTEL_VGA_DEVICE(0x1A84, info), \
- INTEL_VGA_DEVICE(0x5A84, info)
+ INTEL_VGA_DEVICE(0x1A85, info), \
+ INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \
+ INTEL_VGA_DEVICE(0x5A85, info) /* APL HD Graphics 500 */
#define INTEL_KBL_GT1_IDS(info)\
INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
commit 03bed1c7ba838af9aa6ab722aeaa070aa4cc70e3
Author: Lyude
Date: Wed Mar 23 15:44:37 2016 -0400
uxa: Restore old bo on failure
When we fail to do a modeset, we need to make sure that we restore the
previous bo in the event that it's changed. Otherwise we'll crash the X
server the next time we do a pageflip.
This fixes an issue with panning crashing the X server if a user tries
to set a large panning resolution such as 5200x3200, and the GPU doesn't
have enough memory to handle the bo due to being in UXA mode.
Signed-off-by: Lyude
Reviewed-by: Chris Wilson
diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
index 590ff5d..830f094 100644
--- a/src/uxa/intel_uxa.c
+++ b/src/uxa/intel_uxa.c
@@ -1068,7 +1068,7 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
PixmapPtr pixmap;
intel_screen_private *intel = intel_get_screen_private(scrn);
- dri_bo *bo
xserver-xorg-video-intel: Changes to 'upstream-experimental'
configure.ac |2
src/i915_pciids.h| 13 ++-
src/sna/kgem.c | 13 +++
src/sna/sna_damage.h |5 -
src/sna/sna_display.c| 28 ++
src/sna/sna_dri2.c | 53 +---
src/sna/sna_video.h | 22 +
src/sna/sna_video_overlay.c | 10 --
src/sna/sna_video_sprite.c | 10 --
src/sna/sna_video_textured.c |7 -
tools/virtual.c | 179 +--
11 files changed, 296 insertions(+), 46 deletions(-)
New commits:
commit 7817949314a21293c8bc34dec214b42932b19aaf
Author: Chris Wilson
Date: Wed Jan 27 10:54:46 2016 +
sna/dri2: Avoiding marking a pending-signal on a dead Drawable
If the Drawable is gone, we cannot send it a frame-complete signal, and
in particular we cannot continue the pending flip-chain.
References: https://bugs.freedesktop.org/show_bug.cgi?id=93844
Signed-off-by: Chris Wilson
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index f2f4908..045b12d 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -2787,6 +2787,9 @@ sna_dri2_flip_continue(struct sna_dri2_event *info)
info->type = info->flip_continue;
info->flip_continue = 0;
+ if (info->draw == NULL)
+ return false;
+
if (info->sna->mode.front_active == 0)
return false;
@@ -2801,6 +2804,7 @@ sna_dri2_flip_continue(struct sna_dri2_event *info)
info->sna->dri2.flip_pending == info);
info->sna->dri2.flip_pending = info;
info->queued = true;
+ assert(info->draw);
info->signal = info->type == FLIP_THROTTLE;
return true;
@@ -3097,6 +3101,7 @@ sna_dri2_schedule_flip(ClientPtr client, DrawablePtr
draw, xf86CrtcPtr crtc,
assert(info->crtc == crtc);
info->event_complete = func;
info->event_data = data;
+ assert(info->draw);
info->signal = true;
info->front = sna_dri2_reference_buffer(front);
@@ -3133,6 +3138,7 @@ new_back:
sna_dri2_get_back(sna, draw, back);
DBG(("%s: fake triple buffering, unblocking client\n",
__FUNCTION__));
frame_swap_complete(info, DRI2_EXCHANGE_COMPLETE);
+ assert(info->draw);
info->signal = signal;
if (info->type == FLIP_ASYNC)
sna_dri2_event_free(info);
@@ -3156,6 +3162,7 @@ queue:
assert(info->crtc == crtc);
info->event_complete = func;
info->event_data = data;
+ assert(info->draw);
info->signal = true;
info->type = FLIP;
@@ -3312,6 +3319,7 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr
draw, DRI2BufferPtr front,
assert(info->crtc == crtc);
info->event_complete = func;
info->event_data = data;
+ assert(info->draw);
info->signal = true;
info->front = sna_dri2_reference_buffer(front);
@@ -3391,6 +3399,7 @@ fake:
/* XXX Use a Timer to throttle the client? */
fake_swap_complete(sna, client, draw, crtc, type, func, data);
if (info) {
+ assert(info->draw);
info->signal = false;
sna_dri2_event_free(info);
}
commit bb8dc3ef37580a221a40ba3dcbde755edc59bb62
Author: Chris Wilson
Date: Tue Jan 26 12:50:13 2016 +
sna/video: ValidateGC before use
We required the GC->pCompositeClip in order to apply the current Drawable's
clip to video region, this requires us to call ValidateGC first.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93874
Signed-off-by: Chris Wilson
diff --git a/src/sna/sna_video.h b/src/sna/sna_video.h
index dfb8c0c..b278991 100644
--- a/src/sna/sna_video.h
+++ b/src/sna/sna_video.h
@@ -213,4 +213,26 @@ sna_window_set_port(WindowPtr window, XvPortPtr port)
((void **)__get_private(window, sna_window_key))[2] = port;
}
+static inline int offset_and_clip(int x, int dx)
+{
+ x += dx;
+ if (x <= 0)
+ return 0;
+ if (x >= MAXSHORT)
+ return MAXSHORT;
+ return x;
+}
+
+static inline void init_video_region(RegionRec *region,
+DrawablePtr draw,
+int drw_x, int drw_y,
+int drw_w, int drw_h)
+{
+ region->extents.x1 = offset_and_clip(draw->x, drw_x);
+ region->extents.y1 = offset_and_clip(draw->y, drw_y);
+ region->extents.x2 = offset_and_clip(draw->x, drw_x + drw_w);
+ region->extents.y2 = offset_and_clip(draw->y, drw_y + drw_h);
+ region->data = NULL;
+}
+
#endif /* SNA_VIDEO_H */
diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index d782113..
xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.99.917+git20160325-1'
Tag 'xserver-xorg-video-intel-2_2.99.917+git20160325-1' created by Timo
Aaltonen at 2016-03-29 08:00 +
Tagging upload of xserver-xorg-video-intel 2:2.99.917+git20160325-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQIcBAABAgAGBQJW+jYUAAoJEMtwMWWoiYTcjh4P/j5CCUG72l3NBanyufAQFyjk
XXXMGYH/wUQZHjj6YRNXzXZQFFL3rS6o23l5ofY2hXqD62RpUprMDLPx8sz0kCQf
Lq7ZYkQbLcmPUEfvz4Zk4fFuKC2XR1ER39lyoU9zxOVv4gSa6V+C5mWCobw82Ikf
Ua3VgGzvu6LimpOrKvUJMPC2e8QQGRlRJYu/Ty7PB1F0XhqNRtUMoZQ9Y/68C4Q7
FICSvn1sGG0vroG7mybgpF36srunJwtOwbG6dy77Siv0keh0tYErfRG9BTleiNS/
UDulTge6BGB4H8lB6uAKdlDoZMX5TVG9D5d3iIsxD+joSaZuyGyBoaP7HHmLcLUD
YE6Et96Q62sNXfSJwqldZoMPjdfyHIERstKPYzYrlDR4tmm7mm2ZfznyBprWFRBA
RtVmwzzGgPNjXJgI3m6KOhG6d+jros6ebcUHMv3/Kr7k5dD7B+lghnWaHBOSNULl
HqCwKDeM9jvAXC+ZrmIm37K50P8tJcWiUDE1UxMWbAHFCEds1clKG3zch5o7fUVK
/PJK4Lfdpy548ZaJuU+sfbc8OjuVmKR30eQRp1A43LHpHMe8JxExS/0gerjJx6Ky
U8FTWoj0HqDX5iCDT3Y3VNT+yB1oeSYqfatXeR+Qeyip4LZb44omZ/SCiHV5O/FF
wICD+xGMCVw0XBTjxnk3
=yTzn
-END PGP SIGNATURE-
Changes since xserver-xorg-video-intel-2_2.99.917+git20160307-2:
Chris Wilson (28):
sna/present: Add a modicum more debug info
sna: Set initial gamma_size to 256 when loading from hardware
sna: When creating CRTC after initialisation, manually create the RR gamma
sna: Avoid double-skipping when deleting arrays of CRTCs
sna/dri2: Rearrange "impossible" paths to avoid an assert
test/present: Catch FPE when notifies are broken
sna/present: Use the current system time when providing a vblank off
notify
sna/dri2: Cancel all pending events when the window is resized
sna/dri2: Prevent starting a swap chain for a decoupled Pixmap
sna/dri2: Release the dangling chain after decoupling
sna/dri2: Flush outstanding signals when decoupling inflight events
tests: Add DRI2 race against window resize + Composite redirection
sna: Relax tiling requirements to cope with kernel errors
configure: Replace ${} with $() for libtool
tests: Anticipate Present reporting too early
sna/present: Check incoming pitch before flipping
test: Look at Present scaling with number of cpus
sna: Ensure the scanout is fully flushed on LeaveVT
sna/present: Report BadValue if target_msc exceeds last known msc by 1<<32
sna/present: Cancel pending unflips when resizing the screen
sna/present: Requeue early vblank completions
configure: Remove test for strlcat
configure: Remove ACLOCAL_FLAGS passthrough
sna/present: Add missing "static inline" for disabled present stubs
Revert "configure: Remove test for strlcat"
sna/present: Restrict vblank.sequence range to 31bits
Update i915_pciids.h
tools/cursor: Print an ASCII representation as well
Lyude (1):
uxa: Restore old bo on failure
Timo Aaltonen (2):
Merge branch 'upstream-unstable' into debian-unstable
release to unstable
---
Makefile.am|4
debian/changelog |6 +
src/i915_pciids.h |6 -
src/sna/kgem.c | 20 +++
src/sna/kgem.h |1
src/sna/sna.h |2
src/sna/sna_accel.c|1
src/sna/sna_display.c | 10 +
src/sna/sna_display_fake.c |4
src/sna/sna_dri2.c | 121 +++-
src/sna/sna_present.c | 110 +-
src/sna/xassert.h | 21 ++-
src/uxa/intel_uxa.c|6 -
test/dri2-race.c | 264 -
test/present-speed.c | 54 +
test/present-test.c| 255 +--
tools/cursor.c | 16 ++
17 files changed, 759 insertions(+), 142 deletions(-)
---
xserver-xorg-video-intel: Changes to 'upstream-unstable'
Makefile.am|4
src/i915_pciids.h |6 -
src/sna/kgem.c | 20 +++
src/sna/kgem.h |1
src/sna/sna.h |2
src/sna/sna_accel.c|1
src/sna/sna_display.c | 10 +
src/sna/sna_display_fake.c |4
src/sna/sna_dri2.c | 121 +++-
src/sna/sna_present.c | 110 +-
src/sna/xassert.h | 21 ++-
src/uxa/intel_uxa.c|6 -
test/dri2-race.c | 264 -
test/present-speed.c | 54 +
test/present-test.c| 255 +--
tools/cursor.c | 16 ++
16 files changed, 753 insertions(+), 142 deletions(-)
New commits:
commit 094924f7f882da1f32395d4c982db6ad8e0f609f
Author: Chris Wilson
Date: Fri Mar 25 20:59:48 2016 +
tools/cursor: Print an ASCII representation as well
Show the ASCII outline of the cursor as well as the image stored in the
PNG.
Signed-off-by: Chris Wilson
diff --git a/tools/cursor.c b/tools/cursor.c
index 6f4e3f8..6a2438a 100644
--- a/tools/cursor.c
+++ b/tools/cursor.c
@@ -61,6 +61,22 @@ int main(int argc, char **argv)
cur->width, cur->height,
cur->xhot, cur->yhot);
+ if (1) {
+ int x, y;
+
+ src = cur->pixels;
+ for (y = 0; y < cur->height; y++) {
+ for (x = 0; x < cur->width; x++) {
+ if (x == cur->xhot && y == cur->yhot)
+ printf("+");
+ else
+ printf("%c", *src ? *src >> 24 >= 127 ?
'x' : '.' : ' ');
+ src++;
+ }
+ printf("\n");
+ }
+ }
+
file = fopen("cursor.png", "wb");
if (file == NULL)
return 2;
commit 39fbae3c61cc2d78ac5e7c5c471d161fafd53400
Author: Chris Wilson
Date: Thu Mar 24 22:09:48 2016 +
Update i915_pciids.h
Sync with kernel commit 7157bb27e79875db5603aa1e30f56e873a8300f9
Author: Michał Winiarski
Date: Fri Feb 5 13:21:42 2016 +0100
drm/i915/skl: Add missing SKL ids
Signed-off-by: Chris Wilson
diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index f970209..9094599 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -277,7 +277,9 @@
INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */
#define INTEL_SKL_GT3_IDS(info) \
+ INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
+ INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */
@@ -296,7 +298,9 @@
#define INTEL_BXT_IDS(info) \
INTEL_VGA_DEVICE(0x0A84, info), \
INTEL_VGA_DEVICE(0x1A84, info), \
- INTEL_VGA_DEVICE(0x5A84, info)
+ INTEL_VGA_DEVICE(0x1A85, info), \
+ INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \
+ INTEL_VGA_DEVICE(0x5A85, info) /* APL HD Graphics 500 */
#define INTEL_KBL_GT1_IDS(info)\
INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
commit 03bed1c7ba838af9aa6ab722aeaa070aa4cc70e3
Author: Lyude
Date: Wed Mar 23 15:44:37 2016 -0400
uxa: Restore old bo on failure
When we fail to do a modeset, we need to make sure that we restore the
previous bo in the event that it's changed. Otherwise we'll crash the X
server the next time we do a pageflip.
This fixes an issue with panning crashing the X server if a user tries
to set a large panning resolution such as 5200x3200, and the GPU doesn't
have enough memory to handle the bo due to being in UXA mode.
Signed-off-by: Lyude
Reviewed-by: Chris Wilson
diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
index 590ff5d..830f094 100644
--- a/src/uxa/intel_uxa.c
+++ b/src/uxa/intel_uxa.c
@@ -1068,7 +1068,7 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
PixmapPtr pixmap;
intel_screen_private *intel = intel_get_screen_private(scrn);
- dri_bo *bo = intel->front_buffer;
+ dri_bo *bo = intel->front_buffer, *old_bo;
int old_width, old_height, old_pitch;
if (!uxa_resources_init(screen))
@@ -1081,6 +1081,7 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
old_width = pixmap->drawable.width;
old_height = pixmap->drawable.height;
old_pitch = pixmap->devKind;
+ old_bo = intel_uxa_get_pixmap_bo(pixmap);
if (!screen->ModifyPixmapHeader(pixmap,
scrn->virtualX,
@@ -1102,6 +1103,9 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
err:
screen->ModifyPixmapH
Processing of xserver-xorg-video-intel_2.99.917+git20160325-1_source.changes
xserver-xorg-video-intel_2.99.917+git20160325-1_source.changes uploaded successfully to localhost along with the files: xserver-xorg-video-intel_2.99.917+git20160325-1.dsc xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz xserver-xorg-video-intel_2.99.917+git20160325-1.diff.gz Greetings, Your Debian queue daemon (running on host franck.debian.org)
Re: Processed: forwarded upstream
tag 786873 - jessie stretch tag 782329 - jessie stretch tag 788340 - jessie stretch kthxbye On Sun, Mar 27, 2016 at 11:27:06 +, Debian Bug Tracking System wrote: > Processing commands for cont...@bugs.debian.org: > > > tag 786873 upstream jessie stretch > Bug #786873 [xserver-xorg-video-openchrome] xserver-xorg-video-openchrome: > does not show any graphics-output > Added tag(s) stretch and jessie. > > tag 782329 upstream jessie stretch > Bug #782329 [xserver-xorg-video-openchrome] xserver-xorg-video-openchrome: > fails to display any graphics on hp t 5550 thin-client > Added tag(s) jessie and stretch. > > tag 788340 upstream jessie stretch > Bug #788340 [xserver-xorg-video-openchrome] xserver-xorg-video-openchrome: No > graphics with P4M900/VN896/CN896 Chipset on IGEL H700C thin-client > Added tag(s) stretch and jessie. > > This is not how suite tags work. Please don't use them. Cheers, Julien
Minder brandstofverbruik bij De Kock NV en veiligheidsgarantie
Geniet van de faciliteiten van de geolokalisatie van uw wagenpark Vind de beste leverancier: http://www.debesteleverancier.be/traceersysteem/gratis-offerte.htm?lng=nl&tg=geoloc&utm_campaign=geoloc&utm_source=admr&utm_medium=email&you=debian-x@lists.debian.org Door uw voertuigen uit te rusten met een geolokalisatiesysteem, kunt u ze in real time opvolgen. Dit GPS-systeem maakt uw trajecten rendabeler, optimaliseert uw commerciële activiteiten en laat u toe te besparen op de brandstofkosten. Dankzij de nieuwe fleetmanagement technologieën, verhoogt u de veiligheid van uw transporten, maar ook van uw mensen. Een snelle reactie op onverwachte omstandigheden, minder vertragingen en fouten, maximaliseer uw verplaatsingen met een geolokalisatiesysteem. --- Online versie: http://mailing.fb.bb1.mailbb.be/c11236/e71087786/h52230/l341098/index.html Deze e-mail werd verstuurd naar debian-x@lists.debian.org. Profiel aanpassen: http://mailing.fb.bb1.mailbb.be/c11236/e71087786/h52230/l341100/index.html Uitschrijven: http://mailing.fb.bb1.mailbb.be/c11236/e71087786/h52230/l341099/index.html Privacy policy: http://mailing.fb.bb1.mailbb.be/c11236/e71087786/h52230/l341101/index.html
Processed: notfixed 800780 in 1.5.24-1, notfixed 814631 in 1:1.7.8-1, notfound 816075 in 3.2.1-1 ...
Processing commands for cont...@bugs.debian.org:
> # unconfuse bts
> notfixed 800780 1.5.24-1
Bug #800780 {Done: "Matteo F. Vescovi" } [mutt] mutt:
folder-hook: current mailbox shortcut '^' is unset
No longer marked as fixed in versions 1.5.24-1.
> notfixed 814631 1:1.7.8-1
Bug #814631 {Done: Steven Chamberlain }
[src:xserver-xorg-video-siliconmotion] xserver-xorg-video-siliconmotion: FTBFS:
src/smi.h:224:5: error: unknown type name 'IOADDRESS'
No longer marked as fixed in versions 1:1.7.8-1.
> notfound 816075 3.2.1-1
Bug #816075 {Done: Antonio Terceiro } [redmine] redmine:
dependency on ruby-bundler instead of bundler?
Bug #819057 {Done: Antonio Terceiro } [redmine] redmine:
dependency on ruby-bundler instead of bundler?
No longer marked as found in versions redmine/3.2.1-1.
No longer marked as found in versions redmine/3.2.1-1.
> found 819471 1.0.0~dfsg1-3
Bug #819471 [zaz,zaz-data] zaz-data and zaz: error when trying to install
together
Marked as found in versions zaz/1.0.0~dfsg1-3.
> found 819404 0.36-2
Bug #819404 [src:libnagios-plugin-perl] libnagios-plugin-perl: should not be
released in Stretch
Marked as found in versions libnagios-plugin-perl/0.36-2.
> found 819259 7.0.68-1
Bug #819259 [src:tomcat7] Don't include in stretch
Marked as found in versions tomcat7/7.0.68-1.
> thanks
Stopping processing here.
Please contact me if you need assistance.
--
800780: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800780
814631: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=814631
816075: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816075
819057: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819057
819259: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819259
819404: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819404
819471: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819471
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
xserver-xorg-video-intel_2.99.917+git20160325-1_source.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Tue, 29 Mar 2016 10:29:35 +0300 Source: xserver-xorg-video-intel Binary: xserver-xorg-video-intel xserver-xorg-video-intel-dbg Architecture: source Version: 2:2.99.917+git20160325-1 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Timo Aaltonen Description: xserver-xorg-video-intel - X.Org X server -- Intel i8xx, i9xx display driver xserver-xorg-video-intel-dbg - X.Org X server -- Intel i8xx, i9xx display driver (debug symbols) Changes: xserver-xorg-video-intel (2:2.99.917+git20160325-1) unstable; urgency=medium . * New upstream snapshot. Checksums-Sha1: d646a86e2fe28807a0998d541aa885415ca4c23d 3206 xserver-xorg-video-intel_2.99.917+git20160325-1.dsc 0bc0a82335dbe35cdc7749c6fae276d856ea8efb 1603199 xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz fe01f9dbc8e45a0b413eb24300b9b6f064d88813 947675 xserver-xorg-video-intel_2.99.917+git20160325-1.diff.gz Checksums-Sha256: 0ff5f2792e95920d98d6017c023b04cd9108ceaadbb10b98adcc75ab85efe364 3206 xserver-xorg-video-intel_2.99.917+git20160325-1.dsc d4aaab690d4f866592ec664b72442a0b8a4d32158f3d15cfcff21fe84c8f8326 1603199 xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz 7175815f3d5f558c5cd837299ce9ca602e4cbb375f565cb12cb72bbabe856377 947675 xserver-xorg-video-intel_2.99.917+git20160325-1.diff.gz Files: f85469918971e48409013a5b070d4b91 3206 x11 optional xserver-xorg-video-intel_2.99.917+git20160325-1.dsc 40a524ea2165bb31f8dd05899ee02dfa 1603199 x11 optional xserver-xorg-video-intel_2.99.917+git20160325.orig.tar.gz 3d4c6da0b68d22ffece31c724c7c426b 947675 x11 optional xserver-xorg-video-intel_2.99.917+git20160325-1.diff.gz -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBAgAGBQJW+jVEAAoJEMtwMWWoiYTchSUP/jkDhBAf2tlaquUX0OYwX51k 8IBdTXzipHmzN1tBm+Br8EDdJFDsLQfO3XKpTcHgQf4r1Lfz9GpG9ycmNveIbBrS kYbzqmwTVJpfIObjpvj1Cn/KeNjWca5ZbDB79o5gnkCNk9G2yjSMHvQdSPyKERvS JapFeW39s23TE07qCBfgFDuiSoCqKTAdlqnQgmEeb5Yfj6BVWGCjHgz7CagmeSkx AEMvEjtIoK8UkQC9ldRUNX0x2T3zCACIne9o3okZiI/TRRRX+YayiGOeafUR8RaE JpoogY+7TvE+crPkJD9mpFVvgQwkNswUAbNBtVYFHx6nDr55WgdFOvI/S3NbLfsr elBMTFrhFWTFtcw6NBwjtCK3KdUnX16dS0+aO6fFM8weD3CZhOKYK/9/2azGlN/u BVwk1qwT2erT5/co4R9dO/PP2uU8xwShSr88dqAFFD9PjryTVllhRh0dV2VgXya9 Tsbuckov2UmoU85MxT1t1TbCa8bY2exMDx6Ym1BaoAUYxuqPodS6Jzx8seDDhPVn opZPsrRPrxMBb7Xz0Qz3gPi+lKFRk/OIS3b+DpgJ+CM4fqW6+wKLaTNJVGupt5FN pLaGLBNM6U7KhgCkKGalEch7BNKYR0ZmJlr42u7e8Ri6rBErqy+uxZwZIy7V4r3K KHaRtN8na1tNkn14xb3U =s52e -END PGP SIGNATURE- Thank you for your contribution to Debian.
Processed: Re: Processed: forwarded upstream
Processing commands for cont...@bugs.debian.org: > tag 786873 - jessie stretch Bug #786873 [xserver-xorg-video-openchrome] xserver-xorg-video-openchrome: does not show any graphics-output Removed tag(s) stretch and jessie. > tag 782329 - jessie stretch Bug #782329 [xserver-xorg-video-openchrome] xserver-xorg-video-openchrome: fails to display any graphics on hp t 5550 thin-client Removed tag(s) jessie and stretch. > tag 788340 - jessie stretch Bug #788340 [xserver-xorg-video-openchrome] xserver-xorg-video-openchrome: No graphics with P4M900/VN896/CN896 Chipset on IGEL H700C thin-client Removed tag(s) jessie and stretch. > kthxbye Stopping processing here. Please contact me if you need assistance. -- 782329: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782329 786873: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786873 788340: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788340 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
