pixman: Changes to 'refs/tags/pixman-0.30.2-2'
Tag 'pixman-0.30.2-2' created by Maarten Lankhorst at 2013-11-18 14:34 + Debian release 0.30.2-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSiiWSAAoJEP5VjHKmcBPDaBIP/i5PD2J3oM/5tKrDiyRq5YoQ Az97KdwKEN2EtwVtCTTFA4WZG00PC0vdIaGMyJwE501UB4xJM7yokY2f+NVxU77m CA7YJVhGZtfb3CuDF3U2TM6PjBHSwsszLydW6/LPEjPURlQOTNBZyvqrUcF+0BKg 3y1mHJQq/60XeUtldXb/I0MRKEVkw1ebZWGsTMmQOYmCJNjlXfwA0pCSGtXGEphg K1p0w77h3gG8c8846rO71pEVbYxRfjQrR1yS92iJwvb5wK167jJWMVL7tmK9hh/d PmxR5eqEj2g5wUXkAl1svd7oOvEnc7/uEjW83u++tnluII8wABq7SmbrC3x0Hnrl wTH1PSblb56+0F73f4R4MiIVEBSIW+A23YBw/FDAHchAFVMNDIQySSeqhcETqsOQ V/Z0iTvYOlOwCsIZeD/c2lXouQIXa3lPAr6POr34tvlmPuAI5PgOHx8aFuFSJaUO c+qLk8AbYX3TaAkrLQ/3wMhINect1Ptlg+6Ag+InXHxOI89hS6wUd2HPBKXO9Tk6 igVosOft2vbsFGnt7mF/lewj7/bkGB1X9kjUqUNLqH1zEl38WjhauBC9spCo5C1q X62QH2fOobJ+7mCfhA36eSi0UVYsUDZ3OreEFXYE2Eu+EhQU/CfaPkvIS2EDohy3 lIbLUlZoHqnue7kmJHCi =0koY -END PGP SIGNATURE- Changes since pixman-0.30.2-1: Ritesh Khadgaray (1): pixman_trapezoid_valid(): Fix underflow when bottom is close to MIN_INT Søren Sandmann Pedersen (1): test/trap-crasher.c: Add trapezoid that demonstrates a crash --- pixman/pixman.h |2 +- test/trap-crasher.c | 14 +- 2 files changed, 14 insertions(+), 2 deletions(-) --- -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vjtq7-0003kk...@moszumanska.debian.org
pixman: Changes to 'debian-unstable'
debian/changelog|7 +++
pixman/pixman.h |2 +-
test/trap-crasher.c | 14 +-
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 166899c9130b619fb2d62e23adbed4f52d5320e2
Author: Maarten Lankhorst
Date: Mon Nov 18 15:55:02 2013 +0100
release to sid
diff --git a/debian/changelog b/debian/changelog
index 1694686..e9e6f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pixman (0.30.2-2) UNRELEASED; urgency=low
+pixman (0.30.2-2) sid; urgency=low
* Cherry-pick upstream bigfixes for fixing a crash when rendering
invalid trapezoids. (LP: #1197921)
commit 7d8317abd4af300227c3247dd0517a3da6ab8ccc
Author: Maarten Lankhorst
Date: Mon Nov 18 15:54:49 2013 +0100
Cherry-pick upstream bigfixes for fixing a crash when rendering invalid
trapezoids. (LP: #1197921)
diff --git a/debian/changelog b/debian/changelog
index 6d40687..1694686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pixman (0.30.2-2) UNRELEASED; urgency=low
+
+ * Cherry-pick upstream bigfixes for fixing a crash when rendering
+invalid trapezoids. (LP: #1197921)
+
+ -- Maarten Lankhorst Mon, 18 Nov 2013
15:08:56 +0100
+
pixman (0.30.2-1) sid; urgency=low
* New upstream release
commit f740a26fe134da71d0f53df42796c5a131ef1cd4
Author: Ritesh Khadgaray
Date: Wed Oct 23 17:29:07 2013 -0400
pixman_trapezoid_valid(): Fix underflow when bottom is close to MIN_INT
If t->bottom is close to MIN_INT (probably invalid value), subtracting
top can lead to underflow which causes crashes. Attached patch will
fix the issue.
This fixes bug 67484.
(cherry picked from commit 5e14da97f16e421d084a9e735be21b1025150f0c)
diff --git a/pixman/pixman.h b/pixman/pixman.h
index 7ff9fb5..509ba5e 100644
--- a/pixman/pixman.h
+++ b/pixman/pixman.h
@@ -1030,7 +1030,7 @@ struct pixman_triangle
#define pixman_trapezoid_valid(t) \
((t)->left.p1.y != (t)->left.p2.y && \
(t)->right.p1.y != (t)->right.p2.y &&\
- (int) ((t)->bottom - (t)->top) > 0)
+ ((t)->bottom > (t)->top))
struct pixman_span_fix
{
commit f4acde9c71de7be9a2950b9a653b0ba8bea44cf3
Author: Søren Sandmann Pedersen
Date: Wed Oct 23 17:28:11 2013 -0400
test/trap-crasher.c: Add trapezoid that demonstrates a crash
This trapezoid causes a crash due to an underflow in the
pixman_trapezoid_valid().
Test case from Ritesh Khadgaray.
(cherry picked from commit 2f876cf86718d3dd9b3b04ae9552530edafe58a1)
diff --git a/test/trap-crasher.c b/test/trap-crasher.c
index 4e4cac2..77be1c9 100644
--- a/test/trap-crasher.c
+++ b/test/trap-crasher.c
@@ -5,7 +5,7 @@ int
main()
{
pixman_image_t *dst;
-pixman_trapezoid_t traps[1] = {
+pixman_trapezoid_t traps[] = {
{
2147483646,
2147483647,
@@ -18,6 +18,18 @@ main()
{ 0, 2147483647 }
}
},
+ {
+ 32768,
+ - 2147483647,
+ {
+ { 0, 0 },
+ { 0, 2147483647 }
+ },
+ {
+ { 65536, 0 },
+ { 0, 2147483647 }
+ }
+ },
};
dst = pixman_image_create_bits (PIXMAN_a8, 1, 1, NULL, -1);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vjrxu-00019y...@moszumanska.debian.org
xserver-xorg-video-intel: Changes to 'debian-experimental'
NEWS | 71 configure.ac | 31 debian/changelog |2 debian/upstream.changelog | 4552 ++ man/intel.man | 19 src/intel_device.c|3 src/intel_module.c| 12 src/sna/Makefile.am |4 src/sna/blt.c | 13 src/sna/brw/brw_eu_util.c | 126 - src/sna/brw/brw_wm.c | 16 src/sna/fb/fbline.c | 14 src/sna/fb/fblinebits.h | 15 src/sna/gen2_render.c | 11 src/sna/gen3_render.c | 15 src/sna/gen4_common.c | 64 src/sna/gen4_common.h | 49 src/sna/gen4_render.c | 62 src/sna/gen5_render.c | 72 src/sna/gen6_common.c | 71 src/sna/gen6_common.h | 192 + src/sna/gen6_render.c | 231 -- src/sna/gen7_render.c | 277 -- src/sna/kgem.c| 733 -- src/sna/kgem.h| 155 - src/sna/sna.h | 57 src/sna/sna_accel.c | 3255 +++--- src/sna/sna_blt.c | 1263 --- src/sna/sna_composite.c | 20 src/sna/sna_damage.c | 23 src/sna/sna_display.c | 652 -- src/sna/sna_dri.c | 21 src/sna/sna_glyphs.c | 235 +- src/sna/sna_io.c | 1120 ++ src/sna/sna_reg.h | 32 src/sna/sna_render.c |2 src/sna/sna_render.h | 19 src/sna/sna_threads.c |4 src/sna/sna_tiling.c | 320 ++ src/sna/sna_trapezoids.c | 23 src/sna/sna_trapezoids_mono.c |2 src/uxa/i915_video.c |5 src/uxa/intel_driver.c|3 src/uxa/intel_uxa.c |3 test/Makefile.am |2 tools/virtual.c | 227 +- xvmc/i915_xvmc.c |2 xvmc/i965_xvmc.c |2 xvmc/intel_batchbuffer.c | 60 xvmc/intel_batchbuffer.h |4 xvmc/intel_xvmc.c | 58 xvmc/xvmc_vld.c |4 52 files changed, 10926 insertions(+), 3302 deletions(-) New commits: commit 2f4c77515f01c34590c3249f41a104fedd142957 Author: Timo Aaltonen Date: Thu Nov 21 10:55:35 2013 +0200 update changelogs diff --git a/debian/changelog b/debian/changelog index 2cf0521..ca85022 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.904-1) UNRELEASED; urgency=low +xserver-xorg-video-intel (2:2.99.906-1) UNRELEASED; urgency=low * New upstream prerelease. diff --git a/debian/upstream.changelog b/debian/upstream.changelog index 28113c5..6ef20cd 100644 --- a/debian/upstream.changelog +++ b/debian/upstream.changelog @@ -1,3 +1,4555 @@ +commit 7468a6b740af14d95e8f9bacd2e352ec98a9acf2 +Author: Chris Wilson +Date: Tue Nov 12 14:43:28 2013 + + +2.99.906 snapshot + +commit 220a8e8b1425d08af7ac104540be16611279e807 +Author: Chris Wilson +Date: Wed Nov 13 09:52:14 2013 + + +Bump experimental ioctl command numbers + +In the meantime a new ioctl has snuck in. + +Signed-off-by: Chris Wilson + +commit 44c585a1d8c3b603a9c79bf7dfecf420575cfb61 +Author: Chris Wilson +Date: Tue Nov 12 18:59:54 2013 + + +sna: Discard cached upload proxy when writing to the pixmap via the CPU + +Reported-by: Zdenek Kabelac +Signed-off-by: Chris Wilson + +commit 20e318c292a4e1336093dfbc77cb44d099c80050 +Author: Chris Wilson +Date: Sun Nov 10 10:28:01 2013 + + +intel-virtual-output: Manually adjust screen size + +When we modify the outputs and end up with a different screen size, we +need to actually tell the display to resize with an explicit +XRRSetScreenSize. + +Reported-by: Jethro Beekman +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71441 +Signed-off-by: Chris Wilson + +commit 04d2cad65dbb07a2f03835a71fb7f5efc0235ea6 +Author: Chris Wilson +Date: Tue Nov 12 14:36:38 2013 + + +Add identification strings for new Atoms + +All of the new Atom (Baytrail) products ship with "HD Graphics". + +Signed-off-by: Chris Wilson + +commit a6bd3011710a3fd4cfe21a3d41a6ec9c929681bf +Author: Chris Wilson +Date: Tue Nov 12 13:15:25 2013 + + +sna: Factor available memory into available aperture estimation + +Signed-off-by: Chris Wilson + +commit 4493fb8d21fa013a074f7de66387e92ef23d191a +Author: Chris Wilson +Date: Tue Nov 12 00:05:11 2013 + + +sna: Apply drawable offset to glyph bbox prior to checking for clipping + +This is a correction to + +commit ec0866e86d365ae3fd9790b1b263d49fc4981220 +Author: Chris Wilson +Date: Wed Oct 16 22:39:54 2013 +0100 + +sna/glyphs: Fix computation of extents for long strings + +in order for us to correctly detect when we need to clip. + +Bugzilla:
xserver-xorg-video-intel: Changes to 'ubuntu'
NEWS | 71 configure.ac | 31 debian/changelog | 165 debian/patches/series|1 debian/patches/sna-sanitize-output-crtc.diff | 67 debian/upstream.changelog| 4552 +++ man/intel.man| 19 src/intel_device.c |3 src/intel_module.c | 12 src/sna/Makefile.am |4 src/sna/blt.c| 13 src/sna/brw/brw_eu_util.c| 126 src/sna/brw/brw_wm.c | 16 src/sna/fb/fbline.c | 14 src/sna/fb/fblinebits.h | 15 src/sna/gen2_render.c| 11 src/sna/gen3_render.c| 15 src/sna/gen4_common.c| 64 src/sna/gen4_common.h| 49 src/sna/gen4_render.c| 62 src/sna/gen5_render.c| 72 src/sna/gen6_common.c| 71 src/sna/gen6_common.h| 192 + src/sna/gen6_render.c| 231 - src/sna/gen7_render.c| 277 - src/sna/kgem.c | 733 +++- src/sna/kgem.h | 155 src/sna/sna.h| 57 src/sna/sna_accel.c | 3255 --- src/sna/sna_blt.c| 1263 +-- src/sna/sna_composite.c | 20 src/sna/sna_damage.c | 23 src/sna/sna_display.c| 652 ++- src/sna/sna_dri.c| 21 src/sna/sna_glyphs.c | 235 - src/sna/sna_io.c | 1120 -- src/sna/sna_reg.h| 32 src/sna/sna_render.c |2 src/sna/sna_render.h | 19 src/sna/sna_threads.c|4 src/sna/sna_tiling.c | 320 + src/sna/sna_trapezoids.c | 23 src/sna/sna_trapezoids_mono.c|2 src/uxa/i915_video.c |5 src/uxa/intel_driver.c |3 src/uxa/intel_uxa.c |3 test/Makefile.am |2 tools/virtual.c | 227 + xvmc/i915_xvmc.c |2 xvmc/i965_xvmc.c |2 xvmc/intel_batchbuffer.c | 60 xvmc/intel_batchbuffer.h |4 xvmc/intel_xvmc.c| 58 xvmc/xvmc_vld.c |4 54 files changed, 10938 insertions(+), 3521 deletions(-) New commits: commit 00f88d1ab93c6c245b620bf479fe2ceecb11a00f Author: Timo Aaltonen Date: Thu Nov 21 11:09:34 2013 +0200 drop patch diff --git a/debian/changelog b/debian/changelog index bbdf4fd..24defcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.99.906-0ubuntu1) UNRELEASED; urgency=low + + * Merge from unreleased debian git. + * Drop sna-sanitize-output-crtc.diff, upstream. + + -- Timo Aaltonen Thu, 21 Nov 2013 11:00:00 +0200 + xserver-xorg-video-intel (2:2.99.906-1) UNRELEASED; urgency=low * New upstream prerelease. diff --git a/debian/patches/series b/debian/patches/series index 421fa2f..59a6a3b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ # XMir series xmir.patch -sna-sanitize-output-crtc.diff diff --git a/debian/patches/sna-sanitize-output-crtc.diff b/debian/patches/sna-sanitize-output-crtc.diff deleted file mode 100644 index 5b6a11a..000 --- a/debian/patches/sna-sanitize-output-crtc.diff +++ /dev/null @@ -1,67 +0,0 @@ -commit f0bd716425d1514b62565f9a65397cd1cb2ffb3a -Author: Chris Wilson -Date: Thu Oct 10 16:22:45 2013 +0100 - -sna: Sanitize output->crtc before falling back oto xf86InitialConfiguration - -During initialisation, we stash the currently attached CRTC id in -output->crtc. This is fine as ordinarily we would not dereference -output->crtc until after it had been assigned a real CRTC. However, - -commit 6fda305e2f2f991b39d09e67d0b17c8c3d50f9a4 -Author: Chris Wilson -Date: Wed Oct 9 15:59:42 2013 +0100 - -sna: Append the current mode to the output list if not found - -introduces such an early dereference and causes a crash if we fail to -probe the KMS configuration (usually due to a user override). - -Reported-by: Łukasz Maśko -Signed-off-by: Chris Wilson - -diff --git a/src/sna/sna_display.c b/src/sna/sna_di
xserver-xorg-video-intel: Changes to 'upstream-experimental'
NEWS | 71 configure.ac | 31 man/intel.man | 19 src/intel_device.c|3 src/intel_module.c| 12 src/sna/Makefile.am |4 src/sna/blt.c | 13 src/sna/brw/brw_eu_util.c | 126 - src/sna/brw/brw_wm.c | 16 src/sna/fb/fbline.c | 14 src/sna/fb/fblinebits.h | 15 src/sna/gen2_render.c | 11 src/sna/gen3_render.c | 15 src/sna/gen4_common.c | 64 src/sna/gen4_common.h | 49 src/sna/gen4_render.c | 62 src/sna/gen5_render.c | 72 src/sna/gen6_common.c | 71 src/sna/gen6_common.h | 192 ++ src/sna/gen6_render.c | 231 -- src/sna/gen7_render.c | 277 --- src/sna/kgem.c| 733 ++--- src/sna/kgem.h| 155 -- src/sna/sna.h | 57 src/sna/sna_accel.c | 3255 ++ src/sna/sna_blt.c | 1263 src/sna/sna_composite.c | 20 src/sna/sna_damage.c | 23 src/sna/sna_display.c | 652 ++-- src/sna/sna_dri.c | 21 src/sna/sna_glyphs.c | 235 +-- src/sna/sna_io.c | 1120 +- src/sna/sna_reg.h | 32 src/sna/sna_render.c |2 src/sna/sna_render.h | 19 src/sna/sna_threads.c |4 src/sna/sna_tiling.c | 320 src/sna/sna_trapezoids.c | 23 src/sna/sna_trapezoids_mono.c |2 src/uxa/i915_video.c |5 src/uxa/intel_driver.c|3 src/uxa/intel_uxa.c |3 test/Makefile.am |2 tools/virtual.c | 227 ++ xvmc/i915_xvmc.c |2 xvmc/i965_xvmc.c |2 xvmc/intel_batchbuffer.c | 60 xvmc/intel_batchbuffer.h |4 xvmc/intel_xvmc.c | 58 xvmc/xvmc_vld.c |4 50 files changed, 6373 insertions(+), 3301 deletions(-) New commits: commit 7468a6b740af14d95e8f9bacd2e352ec98a9acf2 Author: Chris Wilson Date: Tue Nov 12 14:43:28 2013 + 2.99.906 snapshot diff --git a/NEWS b/NEWS index 79cdf86..e4e980d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,45 @@ +Snapshot 2.99.906 (2013-11-13) +== +Several stability fixes required after the recent tweaking of the core +mechanics to handle the updated TearFree and attempting to make static +analyzers happy. + + * Fix damage handling when rendering to a partially damaged GPU surface. + Regression in 2.99.905 + https://bugs.freedesktop.org/show_bug.cgi?id=70527 + + * Use asprintf() instead of sprintf() + Regression in 2.99.905 + https://bugs.freedesktop.org/show_bug.cgi?id=70835 + + * Improve accounting for fence overallocation on older gen2/3, and + improve the tiling mechanism to fit into the same aperture constraints + https://bugs.freedesktop.org/show_bug.cgi?id=70924 + + * Add an extra GPU flush on Sandybridge to fix some rare font corruption + + * Rasterise lines through all clip boxes + https://bugs.freedesktop.org/show_bug.cgi?id=70802 + + * Fix regression from stricter handling of failures to move a GC to the GPU + Regression in 2.99.905 + https://bugs.freedesktop.org/show_bug.cgi?id=71415 + + * Fix various fail along the memcpy_xor paths, including inadequate error + handling and integer overflow + https://bugs.freedesktop.org/show_bug.cgi?id=70527 + + * Fix outside-of-target stipple uploads + https://bugs.launchpad.net/bugs/1247785 + + * Fix clip detection for long glyphs + Incomplete bug fix (causing a regression) in 2.99.905 + https://bugs.freedesktop.org/show_bug.cgi?id=70527 + + * Fix VSync for the render engine (Xv) on Haswell + https://bugs.freedesktop.org/show_bug.cgi?id=70527 + + Snapshot 2.99.905 (2013-10-23) == The highlight for this snapshot is the extension of TearFree to support diff --git a/configure.ac b/configure.ac index 539ad9b..0783d61 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-intel], -[2.99.905], +[2.99.906], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-intel]) AC_CONFIG_SRCDIR([Makefile.am]) commit 220a8e8b1425d08af7ac104540be16611279e807 Author: Chris Wilson Date: Wed Nov 13 09:52:14 2013 + Bump experimental ioctl command numbers In the meantime a new ioctl has snuck in. Signed-off-by: Chris Wilson diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 7855884..8775d2b 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -129,7 +129,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define LOCAL_I915_EXEC_NO_RELOC (1<<11) #define LOCAL_I915_EXEC_HANDLE_LUT
