xserver-xorg-video-intel: Changes to 'ubuntu'
.gitignore | 1
ChangeLog | 4138 ++++++++++
Makefile.am | 8
NEWS | 67
configure.ac | 55
debian/changelog | 35
debian/control | 5
debian/patches/101_copy-fb.patch | 39
debian/patches/102_remove_surface_binding_cache.patch | 119
debian/patches/120_check_privates.patch | 14
debian/patches/series | 2
man/intel.man | 2
src/Makefile.am | 14
src/common.h | 10
src/i915_video.c | 1
src/i965_reg.h | 4
src/i965_render.c | 102
src/i965_video.c | 3
src/intel.h | 16
src/intel_batchbuffer.c | 52
src/intel_display.c | 2
src/intel_dri.c | 15
src/intel_driver.c | 13
src/intel_module.c | 14
src/intel_uxa.c | 31
src/intel_video.c | 38
src/legacy/i810/Makefile.am | 1
src/legacy/i810/i810.h | 14
src/legacy/i810/i810_cursor.c | 19
src/legacy/i810/i810_driver.c | 21
src/legacy/i810/i810_io.c | 133
src/legacy/i810/xvmc/I810XvMC.c | 2
src/sna/Makefile.am | 12
src/sna/blt.c | 57
src/sna/compiler.h | 51
src/sna/gen2_render.c | 1016 +-
src/sna/gen3_render.c | 984 +-
src/sna/gen4_render.c | 334
src/sna/gen5_render.c | 768 +
src/sna/gen5_render.h | 47
src/sna/gen6_render.c | 734 +
src/sna/gen7_render.c | 388
src/sna/gen7_render.h | 6
src/sna/kgem.c | 851 +-
src/sna/kgem.h | 79
src/sna/kgem_debug.c | 24
src/sna/kgem_debug.h | 3
src/sna/kgem_debug_gen2.c | 631 +
src/sna/kgem_debug_gen3.c | 1
src/sna/kgem_debug_gen7.c | 747 +
src/sna/rop.h | 264
src/sna/sna.h | 150
src/sna/sna_accel.c | 7301 +++++++++++++++---
src/sna/sna_blt.c | 823 +-
src/sna/sna_composite.c | 190
src/sna/sna_damage.c | 704 +
src/sna/sna_damage.h | 81
src/sna/sna_display.c | 85
src/sna/sna_dri.c | 1051 +-
src/sna/sna_driver.c | 141
src/sna/sna_glyphs.c | 439 -
src/sna/sna_gradient.c | 67
src/sna/sna_io.c | 51
src/sna/sna_reg.h | 50
src/sna/sna_render.c | 141
src/sna/sna_render.h | 62
src/sna/sna_render_inline.h | 37
src/sna/sna_tiling.c | 29
src/sna/sna_trapezoids.c | 4208 +++++++---
src/sna/sna_video.c | 261
src/sna/sna_video.h | 25
src/sna/sna_video_overlay.c | 36
src/sna/sna_video_textured.c | 77
src/xvmc/i965_xvmc.c | 2
src/xvmc/intel_batchbuffer.h | 1
src/xvmc/intel_xvmc.c | 2
src/xvmc/xvmc_vld.c | 2
test/.gitignore | 1
test/Makefile.am | 1
test/basic-copyarea-size.c | 6
test/basic-copyarea.c | 3
test/basic-fillrect.c | 3
test/basic-lines.c | 147
test/basic-putimage.c | 3
test/basic-stress.c | 3
test/mixed-stress.c | 3
test/render-composite-solid.c | 3
test/render-copyarea-size.c | 6
test/render-copyarea.c | 3
test/render-fill-copy.c | 3
test/render-fill.c | 3
test/render-trapezoid-image.c | 6
test/render-trapezoid.c | 6
test/test.h | 2
test/test_image.c | 7
uxa/uxa-glyphs.c | 17
uxa/uxa-priv.h | 4
uxa/uxa-render.c | 16
uxa/uxa-unaccel.c | 50
99 files changed, 22746 insertions(+), 5553 deletions(-)
New commits:
commit dc5c756a5dd9ba69d82c9b892da985fe5a7827ea
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Dec 20 21:13:13 2011 +1100
Release to Precise
diff --git a/debian/changelog b/debian/changelog
index 93a9f3f..ddb88ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.17.0-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.17.0-1ubuntu1) precise; urgency=low
* Merge from Debian. Remaining Ubuntu changes:
- 101_copy-fb.patch
commit 658398e6947f2e9e7e843dde4add8c42af851b7b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Dec 20 21:11:33 2011 +1100
Refresh copy-fb patch
diff --git a/debian/changelog b/debian/changelog
index 5fc261e..93a9f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xserver-xorg-video-intel (2:2.17.0-1ubuntu1) UNRELEASED; urgency=low
- debian/xserver-xorg-video-intel.install:
- debian/xserver-xorg-video-intel.udev
+ Add apport hook, triggered on udev GPU error event
+ * 101_copy-fb.patch; refresh.
* Drop 102_remove_surface_binding_cache.patch; included upstream.
* Drop 120_check_privates.patch; fixed at a different level upstream.
diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index e827abb..a84dc77 100644
--- a/debian/patches/101_copy-fb.patch
+++ b/debian/patches/101_copy-fb.patch
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-intel/src/intel.h
===================================================================
---- xserver-xorg-video-intel.orig/src/intel.h 2011-08-09 10:04:02.184071019 +1000
-+++ xserver-xorg-video-intel/src/intel.h 2011-08-09 21:39:33.292370844 +1000
-@@ -436,6 +436,7 @@
+--- xserver-xorg-video-intel.orig/src/intel.h 2011-12-20 15:47:35.802985779 +1100
++++ xserver-xorg-video-intel/src/intel.h 2011-12-20 15:47:38.618985789 +1100
+@@ -432,6 +432,7 @@
OptionInfoPtr Options;
/* Driver phase/state information */
@@ -10,7 +10,7 @@ Index: xserver-xorg-video-intel/src/intel.h
Bool suspended;
enum last_3d last_3d;
-@@ -465,6 +466,7 @@
+@@ -461,6 +462,7 @@
extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
extern int intel_crtc_id(xf86CrtcPtr crtc);
extern int intel_output_dpms_status(xf86OutputPtr output);
@@ -20,8 +20,8 @@ Index: xserver-xorg-video-intel/src/intel.h
DRI2_SWAP,
Index: xserver-xorg-video-intel/src/intel_display.c
===================================================================
---- xserver-xorg-video-intel.orig/src/intel_display.c 2011-08-09 10:04:02.164071017 +1000
-+++ xserver-xorg-video-intel/src/intel_display.c 2011-08-09 21:40:03.962371167 +1000
+--- xserver-xorg-video-intel.orig/src/intel_display.c 2011-12-20 15:47:35.778985780 +1100
++++ xserver-xorg-video-intel/src/intel_display.c 2011-12-20 15:54:45.422987131 +1100
@@ -36,6 +36,8 @@
#include <errno.h>
#include <poll.h>
@@ -31,7 +31,16 @@ Index: xserver-xorg-video-intel/src/intel_display.c
#include "xorgVersion.h"
#include "intel.h"
-@@ -937,6 +939,13 @@
+@@ -45,6 +47,8 @@
+ #include "X11/extensions/dpmsconst.h"
+ #include "xf86DDC.h"
+
++#include "uxa.h"
++
+ struct intel_mode {
+ int fd;
+ uint32_t fb_id;
+@@ -939,6 +943,13 @@
drmModeConnectorPtr koutput = intel_output->mode_output;
struct intel_mode *mode = intel_output->mode;
int i;
@@ -45,7 +54,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
for (i = 0; i < koutput->count_props; i++) {
drmModePropertyPtr props;
-@@ -1630,6 +1639,11 @@
+@@ -1632,6 +1643,11 @@
}
intel->modes = mode;
@@ -57,7 +66,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
return TRUE;
}
-@@ -1699,3 +1713,100 @@
+@@ -1701,3 +1717,100 @@
struct intel_crtc *intel_crtc = crtc->driver_private;
return intel_crtc->pipe;
}
@@ -160,9 +169,9 @@ Index: xserver-xorg-video-intel/src/intel_display.c
+
Index: xserver-xorg-video-intel/src/intel_driver.c
===================================================================
---- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-08-09 10:04:02.144071018 +1000
-+++ xserver-xorg-video-intel/src/intel_driver.c 2011-08-09 21:39:33.292370844 +1000
-@@ -942,6 +942,10 @@
+--- xserver-xorg-video-intel.orig/src/intel_driver.c 2011-12-20 15:47:35.762985780 +1100
++++ xserver-xorg-video-intel/src/intel_driver.c 2011-12-20 15:47:38.618985789 +1100
+@@ -950,6 +950,10 @@
intel->directRenderingType = DRI_DRI2;
#endif
@@ -173,7 +182,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
if (!intel_init_initial_framebuffer(scrn))
return FALSE;
-@@ -950,6 +954,8 @@
+@@ -958,6 +962,8 @@
if (INTEL_INFO(intel)->gen >= 40)
gen4_render_state_init(scrn);
@@ -182,7 +191,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
miClearVisualTypes();
if (!miSetVisualTypes(scrn->depth,
miGetDefaultVisualMask(scrn->depth),
-@@ -1085,6 +1091,7 @@
+@@ -1093,6 +1099,7 @@
intel_mode_init(intel);
@@ -190,7 +199,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
intel->suspended = FALSE;
#if HAVE_UDEV
-@@ -1154,6 +1161,8 @@
+@@ -1159,6 +1166,8 @@
intel_set_gem_max_sizes(scrn);
commit 49feb6295a13b276b38cd457e2f128a036e20fcb
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Dec 20 11:09:15 2011 +1100
Drop [linux-any] hack for pbuilder; it's surely fixed by now.
diff --git a/debian/control b/debian/control
index e70accb..2d6c8af 100644
--- a/debian/control
+++ b/debian/control
@@ -28,11 +28,10 @@ Build-Depends:
libxext-dev,
libxfixes-dev,
libx11-xcb-dev,
- libxcb-util0-dev | libxcb-aux0-dev,
+ libxcb-util0-dev,
libxcb-dri2-0-dev,
# end xvmc
-# libudev-dev [linux-any],
- libudev-dev,
+ libudev-dev [linux-any],
dpkg-dev (>= 1.14.17),
quilt (>= 0.46-7~),
xutils-dev (>= 1:7.5+4),
commit ac079241e8bdff62f3013503a0c514220e2bb54d
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Dec 20 10:59:32 2011 +1100
Document Debian merge, drop patches fixed in new upstream
diff --git a/debian/changelog b/debian/changelog
index 7dc405f..5fc261e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xserver-xorg-video-intel (2:2.17.0-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian. Remaining Ubuntu changes:
+ - 101_copy-fb.patch
+ + Plymouth integration patch
+ - debian/xserver-xorg-video-intel.install:
+ - debian/xserver-xorg-video-intel.preinst.in:
+ - debian/xserver-xorg-video-intel.postinst.in:
+ + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.
+ KMS is the kernel default. Drop after Precise LTS.
+ - debian/apport-gpu-error-intel.py:
+ - debian/control:
+ - debian/rules:
+ - debian/xserver-xorg-video-intel.install:
+ - debian/xserver-xorg-video-intel.udev
+ + Add apport hook, triggered on udev GPU error event
+ * Drop 102_remove_surface_binding_cache.patch; included upstream.
+ * Drop 120_check_privates.patch; fixed at a different level upstream.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 20 Dec 2011 10:47:25 +1100
+
xserver-xorg-video-intel (2:2.17.0-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/patches/102_remove_surface_binding_cache.patch b/debian/patches/102_remove_surface_binding_cache.patch
deleted file mode 100644
index 3dd8b7d..0000000
--- a/debian/patches/102_remove_surface_binding_cache.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 2174f840158aa9cfa370ade38be28f8dc8e4b526 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 03 Nov 2011 20:41:31 +0000
-Subject: uxa: Remove caching of surface binding location
-
-If the pixmap were to be used multiple times within a batch with
-mulitple formats, the cache would only return the initial location with
-the incorrect format and so cause rendering glitches. For instance, GTK+
-uses the same pixmap as an xrgb source and as an argb mask in order to
-premultiply and composite in a single pass. Rather than introduce an
-overly complication caching (handle, format) mechanism, kiss and remove
-the invalid implementation.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40926
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/i965_render.c b/src/i965_render.c
-index 825fc13..8907139 100644
---- a/src/i965_render.c
-+++ b/src/i965_render.c
-@@ -1292,14 +1292,6 @@ gen4_set_picture_surface_state(intel_screen_private *intel,
- }
- intel_batch_mark_pixmap_domains(intel, priv,
- read_domains, write_domain);
-- if (is_dst) {
-- if (priv->dst_bound)
-- return priv->dst_bound;
-- } else {
-- if (priv->src_bound)
-- return priv->src_bound;
-- }
--
- ss = (struct brw_surface_state *)
- (intel->surface_data + intel->surface_used);
-
-@@ -1330,11 +1322,6 @@ gen4_set_picture_surface_state(intel_screen_private *intel,
- offset = intel->surface_used;
- intel->surface_used += SURFACE_STATE_PADDED_SIZE;
-
-- if (is_dst)
-- priv->dst_bound = offset;
-- else
-- priv->src_bound = offset;
--
- return offset;
- }
-
-@@ -1357,14 +1344,6 @@ gen7_set_picture_surface_state(intel_screen_private *intel,
- }
- intel_batch_mark_pixmap_domains(intel, priv,
- read_domains, write_domain);
-- if (is_dst) {
-- if (priv->dst_bound)
-- return priv->dst_bound;
-- } else {
-- if (priv->src_bound)
-- return priv->src_bound;
-- }
--
- ss = (struct gen7_surface_state *)
- (intel->surface_data + intel->surface_used);
-
-@@ -1393,11 +1372,6 @@ gen7_set_picture_surface_state(intel_screen_private *intel,
- offset = intel->surface_used;
- intel->surface_used += SURFACE_STATE_PADDED_SIZE;
-
-- if (is_dst)
-- priv->dst_bound = offset;
-- else
-- priv->src_bound = offset;
--
- return offset;
- }
-
-@@ -1750,8 +1724,6 @@ static Bool i965_composite_check_aperture(intel_screen_private *intel)
-
- static void i965_surface_flush(struct intel_screen_private *intel)
- {
-- struct intel_pixmap *priv;
--
- drm_intel_bo_subdata(intel->surface_bo,
- 0, intel->surface_used,
- intel->surface_data);
-@@ -1768,9 +1740,6 @@ static void i965_surface_flush(struct intel_screen_private *intel)
- intel->surface_bo =
- drm_intel_bo_alloc(intel->bufmgr, "surface data",
- sizeof(intel->surface_data), 4096);
--
-- list_foreach_entry(priv, struct intel_pixmap, &intel->batch_pixmaps, batch)
-- priv->dst_bound = priv->src_bound = 0;
- }
-
- static void
-diff --git a/src/intel.h b/src/intel.h
-index 4acd0f2..3b3f87d 100644
---- a/src/intel.h
-+++ b/src/intel.h
-@@ -176,7 +176,6 @@ struct intel_pixmap {
-
- struct list flush, batch, in_flight;
-
-- uint16_t src_bound, dst_bound;
- uint16_t stride;
- uint8_t tiling;
- int8_t busy :2;
-diff --git a/src/intel_uxa.c b/src/intel_uxa.c
-index 9e58c69..8c6f754 100644
---- a/src/intel_uxa.c
-+++ b/src/intel_uxa.c
-@@ -636,7 +636,6 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo)
- if (priv->bo == bo)
- return;
-
-- priv->dst_bound = priv->src_bound = 0;
- if (list_is_empty(&priv->batch)) {
- dri_bo_unreference(priv->bo);
- } else if (!drm_intel_bo_is_reusable(priv->bo)) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/120_check_privates.patch b/debian/patches/120_check_privates.patch
deleted file mode 100644
index be8d879..0000000
--- a/debian/patches/120_check_privates.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/i965_render.c b/src/i965_render.c
-index b1ac6ba..c5eb611 100644
---- a/src/i965_render.c
-+++ b/src/i965_render.c
-@@ -1126,6 +1126,9 @@ i965_set_picture_surface_state(intel_screen_private *intel,
- uint32_t write_domain, read_domains;
- int offset;
-
-+ if (!priv)
-+ return;
-+
- if (is_dst) {
- write_domain = I915_GEM_DOMAIN_RENDER;
- read_domains = I915_GEM_DOMAIN_RENDER;
diff --git a/debian/patches/series b/debian/patches/series
index 45b3cfa..0ab056a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@
# Ubuntu patches
101_copy-fb.patch
-102_remove_surface_binding_cache.patch
-120_check_privates.patch
commit 0dda59045138b364e1fa40cbf9d320a1aaf3b3a2
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 19 12:47:04 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 3a22527..d542e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-intel (2:2.17.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.17.0-1) unstable; urgency=low
+ [ Timo Aaltonen ]
* New upstream release. (Closes: #635953)
- -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 17 Nov 2011 13:24:07 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sat, 19 Nov 2011 12:46:57 +0100
xserver-xorg-video-intel (2:2.16.0-1) unstable; urgency=low
commit 858e02cdd901f59622abd767f1bae221b34601e7
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Nov 17 18:50:17 2011 +0200
new release closes bug 635953
diff --git a/debian/changelog b/debian/changelog
index 1e50197..3a22527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xserver-xorg-video-intel (2:2.17.0-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release. (Closes: #635953)
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 17 Nov 2011 13:24:07 +0200
commit cb451dc94c6cf722fb21be8814e21a76ce69a3b3
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Nov 17 13:25:49 2011 +0200
update the changelogs
diff --git a/ChangeLog b/ChangeLog
index 8e1407f..6c4ac40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4115 @@
+commit 24ece4a87e34c27115ffb55f91294bce2bdf1502
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 16 23:14:25 2011 +0000
+
+ configure: Version bump for 2.17.0 release
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 14b3176962bd535933623d8ed77ba286b077d6f0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 16 23:13:44 2011 +0000
+
+ NEWS: Release notes for 2.17.0
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c259144e3fc52d078b0a78107c38f0f3d3a2bbc1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 16 10:28:23 2011 +0000
+
+ sna: The block handler is passed an indirect pointer to the timeval
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit bfd2bb40274d1242001d295a4010211fd51b0fc3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 15 10:38:09 2011 +0000
+
+ sna: Correct dependencies for DRI2
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3771387ad11b5842a83e58a4b373c2acdd827bd2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 15 10:32:34 2011 +0000
+
+ Compile out UXA if so desired
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit edbeab8c4edf9e0e89d85add485fe659795b6350
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 15 10:17:06 2011 +0000
+
+ sna: Reduce and clarify dependencies
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 78d4e99fc916e6477edb01c6f24b69ad73adc552
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 15 11:06:04 2011 +0000
+
+ sna: And keep unity happy
+
+ Rewrite the DRI layer to avoid the various bugs and shortcomings of the
+ Xserver and interfacing with mesa.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38732
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39044
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit aac022cbb3342e7027301a3f8c9add8929edbad6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 19:49:29 2011 +0000
+
+ sna: Optimise single pixel transfers
+
+ Surprisingly frequent.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5647e2981d81fd2b5cdb22d544f83d2d0f9445c9
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 14:11:56 2011 +0000
+
+ sna/damage: Always reduce damage for testing PIXMAN_REGION_OUT
+
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=42414
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 405b015fe255c75f91b0f3fe93f06bd14faee5a1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 14:05:10 2011 +0000
+
+ sna: Be explicit in all sna_damage_contains_box() tests
+
+ Clarify the exact in/out/maybe expected result when testing.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5d23149647b1645057dbd89087691e873494f763
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 13:53:37 2011 +0000
+
+ sna: Remove redundant 'can_fill_spans()'
+
+ Spans are almost always accelerated now...
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ae9de984adb275e028e7fbcb8b74a3ce11920eed
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 13:39:34 2011 +0000
+
+ sna: Convert non-FillSolid rectilinear lines to boxes
+
+ And render using the tiled/stippled rect routines instead.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e861e816f53989ce3ab3ec89dd1d9a35155f999a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 13:39:34 2011 +0000
+
+ sna: Convert non-FillSolid rectilinear segments to boxes
+
+ And render using the tiled/stippled rect routines instead.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6fc2928f578ae1e278c968d5c778d99d56bd667a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 13:05:00 2011 +0000
+
+ sna: tidy assignment of composite damage
+
+ Make sure that the damage is always set, even if only to NULL, so that
+ we are safe if in future the operation state is not initially cleared.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 99338ebe61917a07611cbc81cfaf70c0ec905014
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 12:04:49 2011 +0000
+
+ sna: Check whether damage can be reduced to all-damage on moving to GPU
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 00d1c539e4b69636bfc35c0c47a6f1db3a33e731
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 11:19:42 2011 +0000
+
+ sna/damage: Add a little more verbosity to debugging
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 60c0fc101adbc457a7c1927602175f8079175e10
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 11:12:47 2011 +0000
+
+ sna: Refactor some common code into the common destroy-gpu-bo function
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 571457e9a4b0941ec956ef98391e96fe90fb4abc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 10:31:21 2011 +0000
+
+ sna: Be more thorough discarding fences for large objects
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e33dfbe3c00e634328adc7319261e5501f4c7a7a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 09:41:53 2011 +0000
+
+ sna/damage: Verify that all-damage covers the entire pixmap after reduction
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f033172d2f383c7e17362a10f56c4958fb9a3a6b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 09:32:53 2011 +0000
+
+ sna: Fix debug compilation
+
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42887
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0c405595fb8739b22569f81f400100b5dfa472cf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 09:27:49 2011 +0000
+
+ sna: Downgrade tiling in order to fit within fence constraints
+
+ Fixes a later assert that the fenced size is valid for kgem_create_2d()
+
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42888
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1baff9f8cf79fdb4a5649eabcc66cf73487c873e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 14 08:44:35 2011 +0000
+
+ uxa/gen4+: Re-emit composite invariant after video
+
+ Reported-by: Ben Hutchings <ben@decadent.org.uk>
+ Bugzilla: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=635953
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7ad3b377a394c9342c3ab2f003d48b7cb3c0891d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 13 17:53:11 2011 +0000
+
+ sna/video: Use the right pointer for unmapping
+
+ Don't just deference any old random pointer, use the one we actually
+ mapped in the first place!
+
+ Reported-by: Matti Hamalainen <ccr@tnsp.org>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42880
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8da8809d03734d92c3bcf478fe051077ce3caa29
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 13 17:49:23 2011 +0000
+
+ sna/video: Simplify check for 915G[M] which is simply gen==30
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit cac335b979a95e31e201f9766d19d737361e09b2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 13 13:13:03 2011 +0000
+
+ sna/video: Constify a couple of attribute arrays
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e592eb93dbd7df177993986f01ba6f65c4e20d4a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 13 11:16:45 2011 +0000
+
+ configure: Version bump for 2.16.902 snapshot
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 56707b97dc746f7b46dd6cf94ba6c1db85ed619c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 13 11:16:12 2011 +0000
+
+ NEWS: Details for 2.16.902
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f0acc6c0f15875fd51f6df6c8f13d589f9149771
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 13 09:39:47 2011 +0000
+
+ sna/composite: Attempt to reduce the damage is the operation is contained
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 87147b63e905c3566ac1c12e0712f068e90d5e2e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 12 19:35:43 2011 +0000
+
+ sna/damage: Reduce the damage for evaluating sna_damage_is_all
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e8799cdea461df5102d421fda26fecceae79b929
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 12 12:19:31 2011 +0000
+
+ sna: Be stricter and disallow allocation of large fenced objects
+
+ When allocating objects, we need to check the size of the full fenced
+ regions against the mappable limits in order to be able to mmap the
+ object later.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=42813
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0269ec5533ecf7bec0f01c682e085861a3d2ab00
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 12 11:49:32 2011 +0000
+
+ sna: Handle incremental uploads from PutImage
+
+ PutImage rarely uploads the entire image inside a single request,
+ instead breaking up into scanline segments to fit within the protocol
+ limits. A few optimisations are based on detecting when we can discard
+ the GPU bo for an all-dirty CPU pixmap, which are useful in this case so
+ check for an entirely dirty pixmap following an incremental PutImage.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ed68f1b00ae7c0fb3be1f0e758b3683f3c26675b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 12 11:13:59 2011 +0000
+
+ sna/gen7: Fix PRIMITIVE command
+
+ The topology is now an extra dword rather than an embedded field in the
+ command.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 991ffcb60a15f08ebb396d4d4ec86d5aff0ded31
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 11 23:20:36 2011 +0000
+
+ sna: Reset the source counter if we completely dirty the CPU pixmap
+
+ For a long lived pixmap which we are repeatedly using for upload and
+ copying to other pixmaps, we don't want to keep to maintain a GPU
+ buffer. So instead, reset the source counter if we discard the GPU bo
+ and treat the pixmap as purely CPU.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 403a4dd353eef67decfba965e40623e8137e1944
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 11 14:59:03 2011 +0000
+
+ sna: Defer source migration for a solitary upload via CopyArea
+
+ Try to avoid allocating a GPU pixmap for PutImage followed by CopyArea.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 11acfaa62362660ff303f3afe90d1afa36b9ce73
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 11 14:46:33 2011 +0000
+
+ sna/glyph: Tweak the small mask threshold
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c6e6ae1829e06ee8fe8eb063f2433cce603c9f96
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 11 14:22:38 2011 +0000
+
+ sna/glyphs: Cache the glyph pixman_image_t wrapper
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8f50950f467eb2440009a807081f3ba2c9db209b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 15:58:36 2011 +0000
+
+ sna/gen7: Remove stray no-op from GEN7_3DSTATE_SBE
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6a8338fc08a1b7e5e2c6722baa87cff3915b6ef9
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 15:11:13 2011 +0000
+
+ sna: Begin debugging gen7
+
+ This is the stub of the decoder, sufficient to give details of the ops
+ within the batch and to keep the debugger happy.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2309f19638f8b2c35eb60fb44fa988aa5aaab57f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 11:57:21 2011 +0000
+
+ sna/dri: Apply the damage for fullscreen async blits
+
+ Otherwise gnome-shell forgets to update. Eventually, I'll get the async
+ pageflipping bits merged into the Xserver and this path and its extra
+ bw wastage will be history! But still I'll be undermined by the
+ compositor, grrr.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e65c2c54f5efcec16e97085dbc41042007c39151
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 11:37:46 2011 +0000
+
+ sna: Store the sna pointer on the pixmap for cheap lookups
+
+ A large part of the function preamble overhead is the multi-indirection
+ lookup for retrieving the sna pointer. We can eliminate most of these by
+ storing a pointer on the Pixmap as well, which we often need to lookup
+ anyway.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit bddac63de2d26c6ad4ade2f0a038d756f7a41424
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 10:55:13 2011 +0000
+
+ sna: Defer purging a target buffer
+
+ This is to keep the sanity checks upon the caches happy by keeping a
+ potential flush out of the inactive cache.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9083f7edcb05b1deb7a77c9c5a8b54fe73176648
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 10:51:32 2011 +0000
+
+ sna/gen3: Fixup some false asserts
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ea01f7681901e3181204d3117fc0a23655de631f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 10:51:01 2011 +0000
+
+ configure: Force full-debug builds to disable compiler optimisations
+
+commit a72563464f53f24246379afcf1365206fae9aad3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 10 00:55:55 2011 +0000
+
+ sna/gen3: Clear the video shader flag upon batch reset
+
+ Fixes regression from 3252b46e1.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3252b46e115e6cc46abbcc4f502feeb9edc31ad6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 15:16:04 2011 +0000
+
+ sna/gen3: Pack video frames
+
+ If you're going to benchmark, you may as well do so favourably.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8e926759528a12076bd7565672acd82a37aa3eb1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 14:44:54 2011 +0000
+
+ sna/video: Pass texture video limits to the client
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit bca58ff6f02b20ccf88937df8e2688f18cabac80
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 14:18:57 2011 +0000
+
+ sna: Clear kgem->busy when all requests have been processed
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8fdbd01c94c0f6f56247feed8f225901ba39e18e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 13:14:04 2011 +0000
+
+ sna/video: Use the normal bo cache for texture video streams
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 436a78684507129ca1245e065ff68870eb27624b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 12:48:27 2011 +0000
+
+ sna: Track purgeability separately from reusability
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2699c01a396b644a35a9acb969ab556454be3517
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 12:27:52 2011 +0000
+
+ sna: Handle non-reusable bo more correctly during retire
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fcc89d26600a57317007035fa720915e8a2ade81
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 9 12:25:43 2011 +0000
+
+ sna: Safety first; make all flinked bo unreusable
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f62b9f94f64f402e731463205635d386386e274e
Reply to: