xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog |10191 ++++++++++
Makefile.am | 1
NEWS | 52
autogen.sh | 14
configure.ac | 55
debian/changelog | 74
debian/patches/0001-Fix-build-failure-when-passing-with-builderstring.patch | 33
debian/patches/101_copy-fb.patch | 40
debian/patches/103_fix_uxa_fill_spans.patch | 48
debian/patches/104_uxa_fix_gtt_mapping_limits.patch | 152
debian/patches/series | 4
debian/rules | 20
debian/xserver-xorg-video-intel.postinst.in | 16
debian/xserver-xorg-video-intel.preinst.in | 17
m4/.gitignore | 5
src/Makefile.am | 18
src/common.h | 17
src/i830_render.c | 3
src/i915_render.c | 420
src/i965_render.c | 3
src/i965_video.c | 596
src/intel.h | 113
src/intel_batchbuffer.c | 39
src/intel_batchbuffer.h | 5
src/intel_display.c | 136
src/intel_dri.c | 216
src/intel_driver.c | 79
src/intel_driver.h | 4
src/intel_glamor.c | 231
src/intel_glamor.h | 67
src/intel_list.h | 407
src/intel_memory.c | 86
src/intel_module.c | 36
src/intel_shadow.c | 24
src/intel_uxa.c | 231
src/intel_video.c | 4
src/legacy/i810/Makefile.am | 2
src/legacy/i810/i810.h | 7
src/legacy/i810/i810_accel.c | 4
src/legacy/i810/i810_dga.c | 1
src/legacy/i810/i810_dri.c | 1
src/legacy/i810/i810_driver.c | 36
src/legacy/i810/i810_hwmc.c | 1
src/legacy/i810/i810_video.c | 1
src/render_program/Makefile.am | 78
src/render_program/exa_sf.g5a | 99
src/render_program/exa_sf.g5b | 7
src/render_program/exa_sf_mask.g5a | 99
src/render_program/exa_sf_mask.g5b | 7
src/render_program/exa_wm_ca.g5a | 38
src/render_program/exa_wm_ca.g5b | 4
src/render_program/exa_wm_ca_srcalpha.g5a | 37
src/render_program/exa_wm_ca_srcalpha.g5b | 4
src/render_program/exa_wm_mask_affine.g5a | 31
src/render_program/exa_wm_mask_affine.g5b | 4
src/render_program/exa_wm_mask_projective.g5a | 53
src/render_program/exa_wm_mask_projective.g5b | 16
src/render_program/exa_wm_mask_sample_a.g5a | 49
src/render_program/exa_wm_mask_sample_a.g5b | 3
src/render_program/exa_wm_mask_sample_argb.g5a | 49
src/render_program/exa_wm_mask_sample_argb.g5b | 3
src/render_program/exa_wm_noca.g5a | 38
src/render_program/exa_wm_noca.g5b | 4
src/render_program/exa_wm_src_affine.g5a | 31
src/render_program/exa_wm_src_affine.g5b | 4
src/render_program/exa_wm_src_projective.g5a | 49
src/render_program/exa_wm_src_projective.g5b | 16
src/render_program/exa_wm_src_sample_a.g5a | 48
src/render_program/exa_wm_src_sample_a.g5b | 3
src/render_program/exa_wm_src_sample_argb.g5a | 46
src/render_program/exa_wm_src_sample_argb.g5b | 2
src/render_program/exa_wm_src_sample_planar.g5a | 32
src/render_program/exa_wm_src_sample_planar.g5b | 5
src/render_program/exa_wm_write.g5a | 55
src/render_program/exa_wm_write.g5b | 6
src/render_program/exa_wm_xy.g5a | 52
src/render_program/exa_wm_xy.g5b | 4
src/render_program/exa_wm_yuv_rgb.g5a | 98
src/render_program/exa_wm_yuv_rgb.g5b | 12
src/sna/Makefile.am | 21
src/sna/blt.c | 302
src/sna/compiler.h | 8
src/sna/gen2_render.c | 1021 -
src/sna/gen3_render.c | 1381 -
src/sna/gen4_render.c | 1067 -
src/sna/gen5_render.c | 1364 -
src/sna/gen6_render.c | 1949 +
src/sna/gen6_render.h | 19
src/sna/gen7_render.c | 2145 +-
src/sna/gen7_render.h | 280
src/sna/kgem.c | 3564 ++-
src/sna/kgem.h | 251
src/sna/kgem_debug_gen3.c | 8
src/sna/kgem_debug_gen4.c | 27
src/sna/kgem_debug_gen5.c | 27
src/sna/kgem_debug_gen6.c | 50
src/sna/kgem_debug_gen7.c | 36
src/sna/sna.h | 224
src/sna/sna_accel.c | 7064 +++++-
src/sna/sna_blt.c | 971
src/sna/sna_composite.c | 255
src/sna/sna_damage.c | 1014
src/sna/sna_damage.h | 178
src/sna/sna_display.c | 288
src/sna/sna_dri.c | 453
src/sna/sna_driver.c | 21
src/sna/sna_glyphs.c | 137
src/sna/sna_gradient.c | 47
src/sna/sna_io.c | 910
src/sna/sna_reg.h | 1
src/sna/sna_render.c | 1374 +
src/sna/sna_render.h | 102
src/sna/sna_render_inline.h | 102
src/sna/sna_stream.c | 2
src/sna/sna_tiling.c | 399
src/sna/sna_trapezoids.c | 2391 +-
src/sna/sna_video.c | 29
src/sna/sna_video.h | 9
src/sna/sna_video_hwmc.c | 5
src/sna/sna_video_sprite.c | 432
src/sna/sna_video_textured.c | 61
test/.gitignore | 1
test/Makefile.am | 1
test/render-copy-alphaless.c | 285
uxa/Makefile.am | 6
uxa/uxa-accel.c | 321
uxa/uxa-glamor.h | 65
uxa/uxa-glyphs.c | 357
uxa/uxa-priv.h | 16
uxa/uxa-render.c | 395
uxa/uxa-unaccel.c | 58
uxa/uxa.c | 57
uxa/uxa.h | 21
133 files changed, 36832 insertions(+), 9336 deletions(-)
New commits:
commit 63cc898b3d8a1f3f976e0379364547148dff61da
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jun 4 09:39:55 2012 +1000
Release to quantal
diff --git a/debian/changelog b/debian/changelog
index 223542c..7fa4108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.19.0-1ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-1ubuntu1) quantal; urgency=low
* Merge from Debian. Remaining Ubuntu changes:
- 101_copy-fb.patch
commit 6e354bd4b5a1edd27429dbcf30f97e46fc4e5581
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Jun 4 08:57:59 2012 +1000
Drop {pre,post}inst changes needed for Lucid → Precise upgrades
diff --git a/debian/changelog b/debian/changelog
index 580fdd9..223542c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,7 @@ xserver-xorg-video-intel (2:2.19.0-1ubuntu1) UNRELEASED; urgency=low
- 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.
+ + Don't install unnecessary i915-kms.conf; KMS is kernel default.
- debian/xserver-xorg-video-intel.udev
+ Add apport hook, triggered on udev GPU error event
diff --git a/debian/xserver-xorg-video-intel.postinst.in b/debian/xserver-xorg-video-intel.postinst.in
deleted file mode 100644
index ce78578..0000000
--- a/debian/xserver-xorg-video-intel.postinst.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_SCRIPT=postinst
-THIS_PACKAGE=xserver-xorg-video-intel
-
-#INCLUDE_SHELL_LIB#
-
-if dpkg --compare-versions "$2" lt 2:2.9.1-3ubuntu4; then
- remove_conffile_commit /etc/modprobe.d/i915-kms.conf
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xserver-xorg-video-intel.preinst.in b/debian/xserver-xorg-video-intel.preinst.in
deleted file mode 100644
index b3985b7..0000000
--- a/debian/xserver-xorg-video-intel.preinst.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_SCRIPT=preinst
-THIS_PACKAGE=xserver-xorg-video-intel
-
-#INCLUDE_SHELL_LIB#
-
-# We don't want this config file in Ubuntu
-if dpkg --compare-versions "$2" lt-nl 2:2.9.1-3ubuntu4; then
- remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/i915-kms.conf
-fi
-
-#DEBHELPER#
-
-# vim:set ai et sw=2 ts=2 tw=80:
commit 209e2d3037b54ac1045f75d63b8592b19178d377
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Jun 1 10:06:43 2012 +1000
Refresh copy-fb patch
diff --git a/debian/patches/101_copy-fb.patch b/debian/patches/101_copy-fb.patch
index a84dc77..8f2d597 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-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 @@
+--- xserver-xorg-video-intel.orig/src/intel.h 2012-06-01 09:35:35.711057501 +1000
++++ xserver-xorg-video-intel/src/intel.h 2012-06-01 09:38:29.029664251 +1000
+@@ -340,6 +340,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;
-@@ -461,6 +462,7 @@
+@@ -369,6 +370,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-12-20 15:47:35.778985780 +1100
-+++ xserver-xorg-video-intel/src/intel_display.c 2011-12-20 15:54:45.422987131 +1100
+--- xserver-xorg-video-intel.orig/src/intel_display.c 2012-06-01 09:35:35.711057501 +1000
++++ xserver-xorg-video-intel/src/intel_display.c 2012-06-01 09:38:29.029664251 +1000
@@ -36,6 +36,8 @@
#include <errno.h>
#include <poll.h>
@@ -31,16 +31,16 @@ Index: xserver-xorg-video-intel/src/intel_display.c
#include "xorgVersion.h"
#include "intel.h"
-@@ -45,6 +47,8 @@
- #include "X11/extensions/dpmsconst.h"
- #include "xf86DDC.h"
+@@ -48,6 +50,8 @@
+
+ #include "intel_glamor.h"
+#include "uxa.h"
+
struct intel_mode {
int fd;
uint32_t fb_id;
-@@ -939,6 +943,13 @@
+@@ -936,6 +940,13 @@
drmModeConnectorPtr koutput = intel_output->mode_output;
struct intel_mode *mode = intel_output->mode;
int i;
@@ -54,7 +54,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
for (i = 0; i < koutput->count_props; i++) {
drmModePropertyPtr props;
-@@ -1632,6 +1643,11 @@
+@@ -1630,6 +1641,11 @@
}
intel->modes = mode;
@@ -66,7 +66,7 @@ Index: xserver-xorg-video-intel/src/intel_display.c
return TRUE;
}
-@@ -1701,3 +1717,100 @@
+@@ -1699,3 +1715,100 @@
struct intel_crtc *intel_crtc = crtc->driver_private;
return intel_crtc->pipe;
}
@@ -169,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-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 @@
+--- xserver-xorg-video-intel.orig/src/intel_driver.c 2012-06-01 09:35:35.711057501 +1000
++++ xserver-xorg-video-intel/src/intel_driver.c 2012-06-01 09:38:29.029664251 +1000
+@@ -945,6 +945,10 @@
intel->directRenderingType = DRI_DRI2;
#endif
@@ -182,7 +182,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
if (!intel_init_initial_framebuffer(scrn))
return FALSE;
-@@ -958,6 +962,8 @@
+@@ -953,6 +957,8 @@
if (INTEL_INFO(intel)->gen >= 40)
gen4_render_state_init(scrn);
@@ -191,7 +191,7 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
miClearVisualTypes();
if (!miSetVisualTypes(scrn->depth,
miGetDefaultVisualMask(scrn->depth),
-@@ -1093,6 +1099,7 @@
+@@ -1077,6 +1083,7 @@
intel_mode_init(intel);
@@ -199,9 +199,9 @@ Index: xserver-xorg-video-intel/src/intel_driver.c
intel->suspended = FALSE;
#if HAVE_UDEV
-@@ -1159,6 +1166,8 @@
-
- intel_set_gem_max_sizes(scrn);
+@@ -1141,6 +1148,8 @@
+ strerror(errno));
+ }
+ intel_copy_fb(scrn);
+
commit fbeef0beaee1aec5fa7fb034ee6a3aff8fd47ef8
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Jun 1 09:41:22 2012 +1000
Update changelog for 2.19-1 merge
diff --git a/debian/changelog b/debian/changelog
index 55298a3..580fdd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,4 @@
-xserver-xorg-video-intel (2:2.19.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Julien Cristau <jcristau@debian.org> Sat, 26 May 2012 12:38:07 +0200
-
-xserver-xorg-video-intel (2:2.18.0-2ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian. Remaining Ubuntu changes:
- 101_copy-fb.patch
@@ -17,7 +11,13 @@ xserver-xorg-video-intel (2:2.18.0-2ubuntu1) UNRELEASED; urgency=low
- debian/xserver-xorg-video-intel.udev
+ Add apport hook, triggered on udev GPU error event
- -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 11 May 2012 15:50:13 -0700
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 01 Jun 2012 09:36:44 +1000
+
+xserver-xorg-video-intel (2:2.19.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 26 May 2012 12:38:07 +0200
xserver-xorg-video-intel (2:2.18.0-2) unstable; urgency=low
commit 7a9d6cdcd45ff0accc252d4e668054e4ddebbe06
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 26 13:07:25 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 23c0170..884957b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.19.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.19.0-1) unstable; urgency=low
* New upstream release.
- -- Julien Cristau <jcristau@debian.org> Sat, 26 May 2012 11:23:22 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 26 May 2012 12:38:07 +0200
xserver-xorg-video-intel (2:2.18.0-2) unstable; urgency=low
commit dc1d327b4dd7ab65bebf48ab5d76189a3bbf6f32
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 26 11:23:55 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 651ab6a..d8bcdc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,2440 @@
+commit ffdf9aca12adcfa1ec7ab7a1706873105a5f0d4a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 29 21:59:52 2012 +0100
+
+ legacy/i810: hwmc additionally depends upon building DRI
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 444da84c47266bcbbdf5121507901de8eb36f11b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 29 21:49:04 2012 +0100
+
+ configure: Version bump for 2.19.0 release
+
+commit a206a1eee1fb799d567d68db564d663cfc66f6cc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 28 01:54:43 2012 +0100
+
+ sna: Tune relocation array size
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4f1908c651ef9e2af33d8831466a605234978c46
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 27 23:19:56 2012 +0100
+
+ sna: PolyPoint only uses the gc->fgPixel
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8453034c7dd893f1d4c32ee87724f3a13137595d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 27 22:08:51 2012 +0100
+
+ sna/gen6: Allow ring switching at the start of a batch
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 93ad7793894787600c5074917c753fa7c6816134
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 27 22:03:55 2012 +0100
+
+ sna: Tweak semaphores-enabled heuristic
+
+ The kernel module now defaults to -1, confusing the test.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 986dbdda3bf8dcf208e55543d8a3393c4b53f10b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 27 19:21:44 2012 +0100
+
+ sna: Tweak placement choice for high-overhead operations
+
+ Some operations cost more to setup than to transfer data back and forth!
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit daac9a1d036d80ccce83438b49115a236a16bfb6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 27 16:50:28 2012 +0100
+
+ sna: Micro-optimise common case of checking a single fenced bo
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5967d76ca09a257ec9db66ea664158e1dfd083ba
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Apr 25 17:15:37 2012 +0100
+
+ sna: Fixup broken assertion
+
+ It is valid for the cpu_bo to be NULL, as we may be choosing to free the
+ large shadow pixel buffer instead.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 860d3859b586939cd52e45b944cb6abd2a2ca71b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Apr 25 16:04:33 2012 +0100
+
+ sna/gen7: Add CS stall before changing WM binding table
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c219283460c0f2dfdb823e0cb139d05075c6afce
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Apr 25 15:04:01 2012 +0100
+
+ sna/gen7: Apply more recent improvements from SNB perf tuning
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a3371613c9bf577a69cdf811ca1bebaea46bbe95
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Apr 25 11:09:35 2012 +0100
+
+ sna: Do not automagically convert GTT mappings on untiled scanout to CPU
+
+ The likelihood of an untiled mapping of the scanout is slim, except for
+ gen3 with large desktops, and there it should never be in the CPU
+ domain...
+
+ The issue is that we may perform an operation "inplace", yet incoherent
+ with the display engine, and never flush the CPU cache, resulting in
+ render corruption. In theory at least!
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1abd92cd012ee46d44ed4873a5e750d56ae6668f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Apr 25 11:16:30 2012 +0100
+
+ sna: Clear the domain tracking after attaching the bo to scanout
+
+ This is basically to make sure we don't continue treating it as CPU
+ coherent.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8c58c840b1ba579a5601804fc710c58e1e00213f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 23 11:09:37 2012 +0100
+
+ sna/dri: Always clear the scanout when destroying dri2 buffers
+
+ As we may end up holding onto and releasing the Screen pixmap last, we
+ may also be responsible for flushing the last reference to the scanout.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit caf9144271a10f90ea580c246b2df3f69a10b7a0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 20 17:15:37 2012 +0100
+
+ sna: Remove the assertions that the cached upload buffers are active
+
+ These were added to track down some corruption, but the assertions
+ themselves are incorrect, just very rare. The upload buffer may
+ genuinely be cached if we abort the render operation after uploading the
+ source data, leaving the proxy not coupled to any request.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48400
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit aff3614efd5c12e658fa5723934e5bd50a83a316
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 20 13:21:40 2012 +0100
+
+ sna: Always clear the mmapped domains when reusing partial upload buffers
+
+ As we need to make sure that we do invalidate the caches appropriately
+ on reuse. Mildly paranoid, but strictly required by the spec.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit cb6a3dc2edf3cd612f833bc9a4656166735ee856
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Apr 19 10:34:23 2012 +0100
+
+ sna: Discard proxy upload buffer if we choose to render to it
+
+ Even if we try to avoid treating an upload buffer as a real GPU target,
+ we may still choose to migrate the buffer to the GPU in order to keep
+ other buffers on the GPU. In that case, we do want to create a real GPU
+ bo.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4cf74d409ca63c6a479c1ee2187908c04f3b830b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Apr 19 09:09:32 2012 +0100
+
+ sna: Don't consider upload proxies as being on the GPU for render targets
+
+ The upload proxy is a fake buffer that we do not want to render to as
+ then the damage tracking become extremely confused and the buffer it
+ self is not optimised for persistent rendering. We assert that we do not
+ use it as a render target, and this patch adds the check so that we
+ avoid treating the proxy as a valid target when choosing the render
+ path.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fd81408b978c9b57c046ee43d2d32e1370e83a7d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Apr 18 11:39:43 2012 +0100
+
+ sna: Increase the render target alignment to 4 pixels on gen4+ as well
+
+ Repoerted-and-tested-by: Toralf Förster <toralf.foerster@gmx.de
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48865
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 11599e52b842b5db76798879b0fbb57762fe6002
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 17 20:08:14 2012 +0100
+
+ sna/dri: Decouple the frame event info after attaching along error paths
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b817200371bfe16f44b879a793cf4a75ad17bc5c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 17 17:54:58 2012 +0100
+
+ Don't issue a scanline wait while VT switched
+
+ Be paranoid and check that we own the VT before emitting a scanline
+ wait. If we attempt to wait on a fb/pipe that we do not own, we may
+ issue an illegal command and cause a lockup.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit af4a6e8cb52ace594934446e6d8a7aaa1945a9b0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 16 20:57:03 2012 +0100
+
+ sna: Don't assert exported buffers are not busy
+
+ As we do not fully control these buffers, we cannot truly say when they
+ are idle, we can only trust that the split between us and the compositor
+ doesn't lead to much corruption.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a16616209bb2dcb7aaa859b38e154f0a10faa82b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 14 19:03:25 2012 +0100
+
+ uxa: Fix leak of glyph mask for unhandled glyph composition
+
+ ==1401== 7,344 bytes in 34 blocks are possibly lost in loss record 570 of 587
+ ==1401== at 0x4027034: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==1401== by 0x8BE5150: drm_intel_gem_bo_alloc_internal (intel_bufmgr_gem.c:689)
+ ==1401== by 0x899FC04: intel_uxa_create_pixmap (intel_uxa.c:1077)
+ ==1401== by 0x89C2C41: uxa_glyphs (uxa-glyphs.c:254)
+ ==1401== by 0x21F05E: damageGlyphs (damage.c:647)
+ ==1401== by 0x218E06: ProcRenderCompositeGlyphs (render.c:1434)
+ ==1401== by 0x15AA40: Dispatch (dispatch.c:439)
+ ==1401== by 0x1499E9: main (main.c:287)
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ae145c21e9fd3a12164f8b4720d059f9c158249e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 14 18:42:23 2012 +0100
+
+ sna: Avoid leaking the plane resources when determining sprite planes
+
+ Fixes the tiny, one-off leak:
+
+ ==1407== 8 bytes in 1 blocks are definitely lost in loss record 48 of 527
+ ==1407== at 0x402894D: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ ==1407== by 0x8580BE8: drmMalloc (xf86drm.c:147)
+ ==1407== by 0x8583D54: drmAllocCpy (xf86drmMode.c:73)
+ ==1407== by 0x8585265: drmModeGetPlaneResources (xf86drmMode.c:955)
+ ==1407== by 0x8A1BCE9: sna_video_sprite_setup (sna_video_sprite.c:367)
+ ==1407== by 0x8A1A0A3: sna_video_init (sna_video.c:523)
+ ==1407== by 0x89FD4E0: sna_screen_init (sna_driver.c:935)
+ ==1407== by 0x15AD80: AddScreen (dispatch.c:3909)
+ ==1407== by 0x19A2DB: InitOutput (xf86Init.c:817)
+ ==1407== by 0x14981C: main (main.c:204)
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 69a7737abeded6ee923643bd8a80a5a84e6a979c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 14 12:06:51 2012 +0100
+
+ sna: Align texture subsurfaces to 2x2 texture samples
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1d2a46e0902d82b43a5e12af36521a6a7fd6ba39
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 14 12:04:23 2012 +0100
+
+ sna: Align redirect subsurfaces to 2x2 or 4x4 render spans
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1ce2b65d622797000e0a4db7dc851d5b1da04f85
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 14 11:59:31 2012 +0100
+
+ sna: Align render target sizes on gen2/3 to 4x4 render spans
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 89f2b09b1e5be9842747998ea4fe32a6f1ede4cc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 13 16:37:43 2012 +0100
+
+ sna: Avoid using TILING_Y for large objects on gen2/3
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48636
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit eaadbce122059066353743f1653aa16e9d9b747f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 13 15:12:36 2012 +0100
+
+ sna: Relax bogus assertion
+
+ The bo may be considered unmappable due to being bound to outside the
+ mappable region, which we are attempting to rectify through mapping into
+ the GTT domain.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b478420740d05fa87ddbd92042b1f7f2d002f73e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 13 15:07:13 2012 +0100
+
+ sna: Limit the buffer reuse for mappable uploads to only those with mmaps
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 90e2740e7e459c56205fa65bab1ae3dbfd5d3945
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 13 13:51:57 2012 +0100
+
+ sna: Remove the conflicting assertion during GTT map
+
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48636
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9e6d55a8d63f10ca6a2b10e44d00c84b07724485
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 13 09:56:39 2012 +0100
+
+ sna: Don't use miSpan code for wide-spans by default, too expensive
+
+ Only use the fall-forward miSpans code when it prevents a readback.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9becfbbf89f2b170e50f705cabfc7bbf1dcf9846
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 13 09:38:57 2012 +0100
+
+ sna: Draw dashed PolyLines twice, once for the fgPixel, once for the bgPixel
+
+ As the fast paths only setup state upfront, we were missing the state
+ changes required between dash-on/off. Take advantage of that each pixel
+ is only drawn once to batch the state changes and run the
+ miZeroDashLines twice.
+
+ A future task would be to use a custom line drawing routine...
+
+ Fixes regression from ec1267df746512c2e262ef0bd9e9527bc5efe6f4.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e269ed5d4e1b9d758aeb9a85ed0fa631f0aff0b1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Apr 12 22:46:22 2012 +0100
+
+ sna: Restore CPU domain for vmapped buffers when reusing
+
+ For a vmapped upload buffer, we need to notify the kernel (and thereby
+ the GPU) to invalidate the sampler and flush its caches when we reuse an
+ idle buffer.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d29b8650c40c673e6ddddaf52db9247e9836cba8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Apr 12 22:23:12 2012 +0100
+
+ sna: Revert use of mmap64()
+
+ As this just causes mayhem on a 64-bit platform. Doomed if you, doomed
+ if you don't. :(
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a78b1d71a39ae29d5f85bd82c09202ebec3e6539
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Apr 12 15:37:25 2012 +0100
+
+ sna: Declare AC_SYS_LARGEFILE for mmap64
+
+ In order to use the full 32-bits of mmap address space on small
+ platforms we need to use mmap64().
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 09deba927daa96be6230b1c3e1b425622512d8a2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 10 20:59:36 2012 +0100
+
+ sna: Check ioctl return from set-domain
+
+ Let's not assume it succeeds and so avoid altering our bookkeeping along
+ failure paths.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0b12f1d8e4d0a4fafac9553f144535efc4ebe0be
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 10 15:23:54 2012 +0100
+
+ sna: Fix shadowed variable
+
+ sna_accel.c: In function 'sna_pixmap_move_area_to_gpu':
+ sna_accel.c:1751:12: warning: declaration of 'flags' shadows a parameter
+ [-Wshadow]
+ sna_accel.c:1731:72: warning: shadowed declaration is here [-Wshadow]
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 755a7107aed268d87c5cc0feb1ba388b0cb7fc59
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 10 15:19:19 2012 +0100
+
+ sna: Fix typo and use the right pointer for kgem_bo_destroy
+
+ Useless warnings in xorg headers ftl.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48400
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c8502e350cb18f6f5d821d237ffcee453f347eba
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 10 14:43:28 2012 +0100
+
+ sna: Add missing alloc failure check for creating tile source
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9cc6f7ccc55cc11f47b3b7d626c9f5a7c1327d57
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 10 12:06:56 2012 +0100
+
+ sna: Release the freed bo cache upon expire
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 102d11906a672140bac099e7bd1b35345d13a2fc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 9 22:54:51 2012 +0100
+
+ sna: Check for an inactive partial buffer to reuse after retiring requests
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e2fb2421d8f5c07925d1699673aa4b1dd6c6b22c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 9 22:54:15 2012 +0100
+
+ sna: Release partial buffers during cache expiration
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 333fdcad8677675a4758223c1a980c90d970ee42
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 9 22:53:31 2012 +0100
+
+ sna: Repeat expire whilst there remaining outstanding requests
+
+ Do not allow the cache expiration to finish if we are still running
+ requests.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 778232e3d2fb5340a3092014801dc00a56c56d42
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 10 11:14:50 2012 +0100
+
+ sna: Only move the bo into the read domain for readback
+
+ And mark it as currently in no domain afterwards, so that if we reuse
+ it, it will be appropriately moved later.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit dd093eafb9b94b8e4cd8853d74078c3aa7e72f57
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 9 14:09:42 2012 +0100
+
+ sna: Add assertions around proxy list handling
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48400
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7f0bede3e7e3f92a637d1c886304b16afc0e34f2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 9 10:48:08 2012 +0100
+
+ sna/traps: Use a temporary variable for the write pointer
+
+ To avoid accumulating the write offset for wide spans, we need to reset
+ the destination pointer between spans.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48332
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2e4da00e3e03b873f5cad0cc5b1f6cc791852ca5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Apr 9 10:42:18 2012 +0100
+
+ sna/traps: Assert that the inplace row is contained before writing
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48332
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0464e93a088a9e8bc29ad8b36b6e12c3dda32ec6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 8 17:16:03 2012 +0100
+
+ sna: Add some assertions for misuse of proxies
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48400
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 479cb6ba71038fe44f66fb31fad90d0d454fea7a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 8 14:25:49 2012 +0100
+
+ sna: Compress adjoining spans during FillSpans
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c5c01c13badeb7c2ead0c848b746d8d474277a77
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 8 13:51:13 2012 +0100
+
+ sna: Remove the duplicated check for use-bo? in PolySegments
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f5deea4f60433ee2b0c2d02fba682fff8b7829e8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 8 13:39:47 2012 +0100
+
+ sna: Correct partial-write flag for PolySegments fallback
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c3d7f4c1cf7d052163b7c4e74bb202c618f0eb76
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 8 13:18:56 2012 +0100
+
+ sna/gen3: Reset accumulated constants for each composite
+
+ In particular the glyph routines require the composite setup to
+ reinitialise state between glyph runs. This affects anything trying to
+ use glyphs without a mask with a gradient source, for example.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 701473d20485a0557b4fb36efcbfbb8656e2f619
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Apr 8 10:09:42 2012 +0100
+
+ sna: Release cached upload buffers when reusing a write buffer for readback
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=48400
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1ecf17b2507f95e1fefea15833fa9f57ec256a2e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Apr 7 10:01:01 2012 +0100
+
+ sna/gradient: Compute the absolute delta between color stops
+
+ Otherwise we do not detect gradients that start from white!
+
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48407
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4356fae72db3a33935b575edf95c84fbb48072a7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Apr 6 21:10:50 2012 +0100
+
+ sna/video: Only wait upon the scanout pixmap
+
+ Caught by the addition of the assertion.
Reply to: