xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 13 +++++++++++--
debian/patches/120_check_privates.patch | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit 16e2a4244cd619f228ba3d698e308ff5410a15b7
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed May 4 19:13:42 2011 -0700
Target to oneiric
diff --git a/debian/changelog b/debian/changelog
index fffdfa7..9c81a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.14.0-4ubuntu8) natty; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4ubuntu8) oneiric; urgency=low
* Add 120_check_privates.patch: Check for null privates pointer
on render_dest_picture. Prevents segmentation fault with Tk
strings in widgets beyond a certain length.
(LP: #731424)
- -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 May 2011 18:52:29 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 May 2011 19:13:24 -0700
xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
commit 6cfdaa37217322f2279138f403c6c47da6a9848f
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed May 4 18:53:34 2011 -0700
Check null pointer at lower level, right before dereference.
diff --git a/debian/changelog b/debian/changelog
index 58f0608..fffdfa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.14.0-4ubuntu7.2) natty; urgency=low
+xserver-xorg-video-intel (2:2.14.0-4ubuntu8) natty; urgency=low
* Add 120_check_privates.patch: Check for null privates pointer
on render_dest_picture. Prevents segmentation fault with Tk
strings in widgets beyond a certain length.
(LP: #731424)
- -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 May 2011 17:24:35 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 May 2011 18:52:29 -0700
xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
diff --git a/debian/patches/120_check_privates.patch b/debian/patches/120_check_privates.patch
index 58d0c66..be8d879 100644
--- a/debian/patches/120_check_privates.patch
+++ b/debian/patches/120_check_privates.patch
@@ -1,22 +1,14 @@
diff --git a/src/i965_render.c b/src/i965_render.c
-index b1ac6ba..7831caf 100644
+index b1ac6ba..c5eb611 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
-@@ -1761,6 +1761,7 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
- {
- ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(scrn);
-+ PicturePtr dest_picture = intel->render_dest_picture;
- struct gen4_render_state *render_state = intel->gen4_render_state;
- Bool has_mask;
- float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
-@@ -1842,6 +1843,9 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
+@@ -1126,6 +1126,9 @@ i965_set_picture_surface_state(intel_screen_private *intel,
+ uint32_t write_domain, read_domains;
+ int offset;
- intel_batch_start_atomic(scrn, 200);
- if (intel->needs_render_state_emit) {
-+ if (!dest_picture->devPrivates)
-+ return;
++ if (!priv)
++ return;
+
- i965_bind_surfaces(intel);
-
- if (INTEL_INFO(intel)->gen >= 60)
+ if (is_dst) {
+ write_domain = I915_GEM_DOMAIN_RENDER;
+ read_domains = I915_GEM_DOMAIN_RENDER;
commit 94bfee39d75b0c151fa8bd194be7869ca5790c0b
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed May 4 17:57:50 2011 -0700
Add patch to check for null privates pointer before deref
diff --git a/debian/changelog b/debian/changelog
index 0e1fc66..58f0608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu7.2) natty; urgency=low
+
+ * Add 120_check_privates.patch: Check for null privates pointer
+ on render_dest_picture. Prevents segmentation fault with Tk
+ strings in widgets beyond a certain length.
+ (LP: #731424)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 04 May 2011 17:24:35 -0700
+
xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
* Add 119_disable_relaxed_fencing.patch: The relaxed fencing
diff --git a/debian/patches/120_check_privates.patch b/debian/patches/120_check_privates.patch
new file mode 100644
index 0000000..58d0c66
--- /dev/null
+++ b/debian/patches/120_check_privates.patch
@@ -0,0 +1,22 @@
+diff --git a/src/i965_render.c b/src/i965_render.c
+index b1ac6ba..7831caf 100644
+--- a/src/i965_render.c
++++ b/src/i965_render.c
+@@ -1761,6 +1761,7 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
+ {
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
++ PicturePtr dest_picture = intel->render_dest_picture;
+ struct gen4_render_state *render_state = intel->gen4_render_state;
+ Bool has_mask;
+ float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
+@@ -1842,6 +1843,9 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
+
+ intel_batch_start_atomic(scrn, 200);
+ if (intel->needs_render_state_emit) {
++ if (!dest_picture->devPrivates)
++ return;
++
+ i965_bind_surfaces(intel);
+
+ if (INTEL_INFO(intel)->gen >= 60)
diff --git a/debian/patches/series b/debian/patches/series
index 857a420..ae6c5e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
115_quell_vblank_counter_failed.patch
117_946gz_isreally_965g.patch
119_disable_relaxed_fencing.path
+120_check_privates.patch
commit 22a964b3dc8fef772cc55ededc5b10c219e73c77
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed May 4 17:24:18 2011 -0700
Add another bug # for last fix
diff --git a/debian/changelog b/debian/changelog
index 83eb429..0e1fc66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,9 @@ xserver-xorg-video-intel (2:2.14.0-4ubuntu7.1) natty-proposed; urgency=low
optimization is suspected as the cause for various i915/945 gpu lockup
issues. This disables the optimization by default but adds an
xorg.conf parameter to let people experiment with it turned on.
- (LP: #727594, #761143, #761632)
+ (LP: #727594, #761143, #761632, #755693)
- -- Bryce Harrington <bryce@ubuntu.com> Fri, 22 Apr 2011 17:54:51 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 22 Apr 2011 19:12:55 -0700
xserver-xorg-video-intel (2:2.14.0-4ubuntu7) natty; urgency=low
Reply to: