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 <tjaalton@ubuntu.com>
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 <chris@chris-wilson.co.uk>
+Date: Tue Nov 12 14:43:28 2013 +0000
+
+ 2.99.906 snapshot
+
+commit 220a8e8b1425d08af7ac104540be16611279e807
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 13 09:52:14 2013 +0000
+
+ Bump experimental ioctl command numbers
+
+ In the meantime a new ioctl has snuck in.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 44c585a1d8c3b603a9c79bf7dfecf420575cfb61
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 12 18:59:54 2013 +0000
+
+ sna: Discard cached upload proxy when writing to the pixmap via the CPU
+
+ Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 20e318c292a4e1336093dfbc77cb44d099c80050
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 10 10:28:01 2013 +0000
+
+ 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 <freedesktop-bugs@jbeekman.nl>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71441
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 04d2cad65dbb07a2f03835a71fb7f5efc0235ea6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 12 14:36:38 2013 +0000
+
+ Add identification strings for new Atoms
+
+ All of the new Atom (Baytrail) products ship with "HD Graphics".
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a6bd3011710a3fd4cfe21a3d41a6ec9c929681bf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 12 13:15:25 2013 +0000
+
+ sna: Factor available memory into available aperture estimation
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4493fb8d21fa013a074f7de66387e92ef23d191a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 12 00:05:11 2013 +0000
+
+ sna: Apply drawable offset to glyph bbox prior to checking for clipping
+
+ This is a correction to
+
+ commit ec0866e86d365ae3fd9790b1b263d49fc4981220
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ 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: https://bugs.freedesktop.org/show_bug.cgi?id=71191
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c489934ed732ed3d5a906939381c62a6bc1c38d5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 11 14:56:22 2013 +0000
+
+ xvmc: Handle allocation failure around batch submission
+
+ If we fail to allocate a new batch, just stall and reuse the old one
+ rather than crashing.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3e93449b5492a4fc09401c23f8754655b63959b5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 11 13:15:07 2013 +0000
+
+ intel-virtual-output: Fix format specifiers for Visual DBG
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 31b5ff5889593337bf504dafa116a428bf1ffe9c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 11 12:56:30 2013 +0000
+
+ intel-virtual-output: Fix cut'n'paste DBG error
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 29fcc15efabb5b1f7e1e0211da9714cf9e3cbd1c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 11 11:44:17 2013 +0000
+
+ sna: Assert that gc->funcs is never set to NULL
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=71415
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit aa140ef1e62c349936be5f153e4be7688e129e63
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 11 11:38:46 2013 +0000
+
+ sna: Add a couple more asserts to track a potential NULL gc->pCompositeClip
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=71415
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3e81a9cbd68344450a6e82130edfef21dd04ec43
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 11 10:47:24 2013 +0000
+
+ intel-virtual-output: Avoid the infinite loop around XPending
+
+ XPending() reports if there are any events pending and does not perform
+ any dequeuing itself - ergo for a remote display while (XPending()) ;
+ becomes an infinite loop should there be an event pending.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=71345
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 922a8bab89c1a5970db61670aaee21e827652bc2
+Author: Rémi Cardona <remi@gentoo.org>
+Date: Fri Nov 8 20:14:59 2013 +0100
+
+ configure: Use proper variables set by PKG_CHECK_MODULES
+
+ $DRI_CFLAGS does not actually exist. The PKG_CHECK_MODULES call creates
+ a $DRI1_CFLAGS variable instead. This doesn't break often because
+ "recent" versions of xorg-server.pc indirectly depend on xf86driproto.pc
+ thus bringing in the required CFLAGS through $XORG_CFLAGS.
+
+ Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=490342
+ Signed-off-by: Rémi Cardona <remi@gentoo.org>
+
+commit 7b0771180dc9bb7276a473db5663f41b5929199b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 10 10:34:06 2013 +0000
+
+ intel-virtual-output: Do not hide the cursor on the local/source display
+
+ Whilst we want to take over and hide the cursor on the remote displays,
+ on the source we need to not interfere with the host.
+
+ Reported-by: Jethro Beekman <freedesktop-bugs@jbeekman.nl>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71439
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b3b02a879bd6f29447e20fb5bb51c0a4a48a7928
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 9 11:15:39 2013 +0000
+
+ sna: Assert that we do setup the gc->pCompositeClip upon ValidateGC
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3ec663bf1c83ea1e470e94b9fb703346fc5bd39e
+Merge: d9ecb91 abf1a16
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 9 11:06:12 2013 +0000
+
+ Merge branch 'master' of hsw:/usr/src/xf86-video-intel
+
+commit abf1a16914d993cc150005879375d4bb17fdccf3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 17:09:35 2013 +0000
+
+ intel-virtual-output: Only track the most recent visibility status of the cursor
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b46d0d327140a1b17066e473d6d61798ffb9871a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 14:04:32 2013 +0000
+
+ intel-virtual-output: Fix forced synchronisation of clones
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fa40286e2f12a4757d1b9bcbe1f1d7c5170bd7da
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 13:53:48 2013 +0000
+
+ intel-virtual-output: Tighten bad_visual() checks
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 83c33a1f436c947ab3d9289a9c57d92f964e9541
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 13:00:11 2013 +0000
+
+ intel-virtual-output: Disable event tracking after a failure
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8b10c528044840d6c2a6244034fc6c2555476b8e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 12:58:06 2013 +0000
+
+ intel-virtual-output: Add DBG for the latest XSync
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 969b064f74e0058a49afa17287184005d1e11402
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 12:54:01 2013 +0000
+
+ intel-virtual-output: Perform an explicit sync
+
+ If we fail to track rendering using ShmCompletionEvents and begin to
+ drop frames, insert an explicit XSync.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e0075ccee2e7bbe46ecbf717817d468cc9248cc4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 12:46:08 2013 +0000
+
+ intel-virtual-output: Check for pending events before skipping draw
+
+ Make sure we check if the destination display has caught up before
+ skipping a frame.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ea4f99c333b181eb21012b5bee60251695e93c8b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 12:30:21 2013 +0000
+
+ intel-virtual-output: Add some DBG for bad_visual()
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 84d667b94a97ad5fde68d730d57a19e1f4241ed5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 8 08:53:55 2013 +0000
+
+ sna: Always schedule upload buffers for retirement after use
+
+ Even if they are multiply referenced due to cached references.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d9ecb91ef123ee4e88020d0328a8c1fafad30e6c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 7 14:58:08 2013 +0000
+
+ sna: Skip an unmappable linear bo when searching through a cache for a GTT mapping
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit cb579a4444146a0736c7bad5edc1f382a32b6bf6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 7 14:54:39 2013 +0000
+
+ sna: Only assert that the bo is small enough to be mmapped
+
+ Not that is currently in a position to be mapped without eviction.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 68cef6cd281572fcfb76a341dc45b7c8e5baffe6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Nov 7 13:09:25 2013 +0000
+
+ sna/gen7: Request secure batches for Haswell vsync
+
+ Since commit 8ff8eb2b38dc705f5c86f524c1cd74a811a7b04c
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Mon Sep 9 16:23:04 2013 +0100
+
+ sna/hsw: Scanline waits require both DERRMR and forcewake
+
+ we have been emitting LRI to enable vsync on the render ring. This
+ requires a privileged batch buffer, and whilst we were checking for
+ kernel support, we forgot to actually tell the kernel to submit the
+ batch with the right privileges.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71328
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b796c33411218aeaf4daaeff41a1bc442b5f945f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 16:24:28 2013 +0000
+
+ sna: Always copy from the tile source
+
+ The first step when tiling with an intermediatory is to copy from the
+ source bo to the temporary. The alu should only be applied when copying
+ from the temporary to the destination.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ace764501ec7c440eddc1d26670f6fbf29fa648d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 15:42:35 2013 +0000
+
+ sna: Remove erroneous assertion from sna_tiling_blt_composite
+
+ We have to rely on the caller only calling us for a PictOpSrc equivalent
+ operation as they don't all set op->op.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7a9c1e153a9208e8cd7680e478fde18e051beaa9
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 15:04:24 2013 +0000
+
+ sna: Add a DBG breadcrumb to kgem_bo_convert_to_gpu()
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ae380a960df6b3a9714d78eb6cb42249764488ba
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 14:51:42 2013 +0000
+
+ sna: Use tiling BLT fallback for BLT composite operations
+
+ This avoid a circuituous route through the render pathways and multiple
+ levels of tiling fallbacks to accomplish the same copy.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7578809ddcb244ad78ebf86359b7ee2a61e27ff6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 13:42:27 2013 +0000
+
+ sna: Trim create flags if tiled sizes are too large
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 073465817f54507ab6b7f801c5dfab2c06f678c0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 13:41:39 2013 +0000
+
+ sna: Fences are power-of-two sizes
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a6b008d69235cbbb572d7d4b33940d2cedd66556
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 11:38:53 2013 +0000
+
+ sna: Fixup unwind checks for future BLT commands
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 22b6a331d0a102e8a8b9fcac1d75f8c9e16596b6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 09:05:05 2013 +0000
+
+ sna: Clear the execlist if we completely unwind a batch after using 8x8 tiling
+
+ Another location, but the right function this time!
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c3d5b1d8fcb1b65c35827d38bf5b309e433d0907
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 09:40:56 2013 +0000
+
+ sna: Move initialisation of loop counter to common code
+
+ It was only being defined in x86-64 and left unitialized for x86-32.
+
+ Fixes regression from
+ commit 587c4866652e40e1e228b333028114766a6d3b08
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Mon Nov 4 15:10:40 2013 +0000
+
+ sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71286
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1a31335954b4d244d10e2594ae00e60762536a77
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 09:05:05 2013 +0000
+
+ sna: Clear the execlist if we completely unwind a batch after using 8x8 tiling
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ef842d2ceee4d1ccf8a0f8a81530dc8be8e18b44
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 6 08:56:01 2013 +0000
+
+ sna: Be more pessimistic for tiling sizes on older gen
+
+ On the older generation, we have severe alignment penalties for fenced
+ regions which dramatically reduce the amount of space we can effectively
+ use in a batch. To accommodate this, reduce the tiling step size.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f2f9019bae5f6f03b5e23da759d3871fc18dd9f4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 22:41:06 2013 +0000
+
+ sna: Only operate inplace if no existing CPU damage for a read
+
+ With a large object, we try harder to operate inplace (to avoid creating
+ a second large CPU bo). This introduced an issue where we tried to read
+ from the GPU bo when there was already existing damage in the CPU -
+ triggering an assertion.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7f901495cdef0ae3b4a328bb98a6bc0ff03ea362
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 21:59:37 2013 +0000
+
+ sna: Trim the overestimate of required aperture space for fence alignment
+
+ We can optimistically only require that we waste the largest fence
+ region in a batch, as all other fences will then be naturally aligned as
+ well. So long as the kernel succeeds in defragmenting the aperture...
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 736b496b458d666416ea94f157c05ce78f98a600
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 21:33:18 2013 +0000
+
+ sna: Mark partial move_area_to_gpu with MOVE_READ on promotion to move_to_gpu
+
+ When promoting a partial move_area_to_gpu to a full move_to_gpu, we have
+ to disable certain optimisations that we try to use if MOVE_READ==0.
+
+ Reported-and-tested-by: Matti Hamalainen <ccr@tnsp.org>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71198
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 723f17ca4f9c120be5fe667bf2c3e35c7ee687be
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 18:36:45 2013 +0000
+
+ sna: Submit execution on the bo before changing its caching status
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 10b573c5084cabcc1bae70c8d35311fa5ec0a245
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 18:29:46 2013 +0000
+
+ sna: Clear snoop flag after converting from a CPU bo
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit dc61705a6e425952de4c81c2320382af07cf948a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 08:49:28 2013 +0000
+
+ sna: Use an inplace exchange for large untiled BO
+
+ On older architectures, large BO have to be untiled and so we can reuse
+ an existing CPU bo by adjusting its caching mode.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=70924
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f3225fcb38686f3b9701725bf3a11ecf1c100c3f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Nov 5 08:38:22 2013 +0000
+
+ sna: Be move conservative with tiling sizes for older fenced gen
+
+ The older generations have stricter requirements for alignment of fenced
+ GPU surfaces, so accommodate this by reducing our estimate available
+ space for the temporary tile.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 93193aaf7d0fc4e3a3b9be1632bfd36331b47d2e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 22:14:05 2013 +0000
+
+ test
+
+commit a0d1de962a8107cfcaefd82eb8ffaf3e4da0e130
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 16:45:00 2013 +0000
+
+ sna: Check for loss of state after setting up a fill BLT op
+
+ If we install a BLT fill operation early in the drawing sequence (i.e.
+ before calling a mi routine), we may lose our state to delayed
+ initialisation of sources and so need to subsequently recheck.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fcd081ca77c917c7000f8ab4668e5c863381a4f3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 15:17:51 2013 +0000
+
+ sna: s/active/busy/ to silence compiler warning
+
+ kgem.c: In function 'kgem_check_bo':
+ kgem.c:4768:7: warning: declaration of 'active' shadows a global declaration [-Wshadow]
+ kgem.c:692:21: warning: shadowed declaration is here [-Wshadow]
+ kgem.c: In function 'kgem_check_many_bo_fenced':
+ kgem.c:4907:7: warning: declaration of 'active' shadows a global declaration [-Wshadow]
+ kgem.c:692:21: warning: shadowed declaration is here [-Wshadow]
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 587c4866652e40e1e228b333028114766a6d3b08
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 15:10:40 2013 +0000
+
+ sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor
+
+ Reported-by: Conley Moorhous <conleymoorhous@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70527
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8f6e227ba8127a2ca034271f2a660c24abbe056f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 12:57:01 2013 +0000
+
+ sna: Apply the BLT source offset for individual copies
+
+ Following a complex path through multiple layers of indirections and
+ tiling fallbacks, resulted in hitting a path where the source offset was
+ subsequently ignored. This leads to the operation reading from invalid
+ memory (or hitting the assert warning about the same).
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=70924
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 82b646a42f5a6271c8518ad454f1603714276caf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 11:48:04 2013 +0000
+
+ sna: Only use the simple stipple upload path if wholly contained
+
+ If the stipple box is outside of the stipple pixmap, we need to
+ carefully upload the stipple using the modulus operation.
+
+ Buzilla: https://bugs.launchpad.net/bugs/1247785
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e678cead11b53699694f5b5cf52ff3ea0e08f637
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 11:47:29 2013 +0000
+
+ sna: Update DBG formats for larger BO offset integers
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 94f9beb8fbb31c2b6158e492e02ff05c9ebc674f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 11:30:39 2013 +0000
+
+ sna: Remove the replace indirection prior to performing write_boxes
+
+ As write_boxes itself decides whether or not to stage the upload into
+ the destination bo, we can destroy the temporary allocation along the
+ write_boxes fallback path (i.e. after failing to map the destination
+ bo).
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ad3959324c02de2e73e7d1142d42248f7dbb4518
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 11:12:30 2013 +0000
+
+ sna: Only destroy the old GPU after successfully replacing it
+
+ Along the sna_replace__xor path we destroyed the priv->gpu_bo twice upon
+ successfully replacing it.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=70527
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8d067e961920e19fda7e9990440ac2be1a2e1760
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 09:34:25 2013 +0000
+
+ sna: Rename the two variants of pwrite so very relative dangers are obvious
+
+ Since we extend the write in the cache-aligned routine, it runs the risk
+ of reading from beyond the end of the allocation. As such, callers
+ should be carefully vetted to make sure that their allocations are
+ already cache-aligned (typically page-aligned). To make it obvious that
+ this complexity exists, rename the routine.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7050c8da56676b60a602dce9abbdb61a7c4fa61e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 4 09:31:05 2013 +0000
+
+ sna: Use the unoptimized pwrite for general buffers
+
+ When we call kgem_bo_write() we have less control over the allocation of
+ the buffer, and do not ensure it meets the alignment criteria required
+ for the cacheline optimisation. So use the simple pwrite routine to
+ avoid reading beyond the end of the allocation.
+
+ Reported-and-tested-by: Mark Kettenis <mark.kettenis@xs4all.nl>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 10023bf8f5a95b4e9f42c05370bc2c103d6a3d3d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 3 22:07:22 2013 +0000
+
+ sna: Use fast-path target placement if we are also IGNORE_CPU
+
+ If we are ignoring CPU damage, we also need only to check GPU damage
+ when considering placement of the target bo.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 08d8a47e7c8b9bcb5bb317be4623161e58e0e0cc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Nov 3 19:51:56 2013 +0000
+
+ sna: Wrap staging buffer access with sigtrap handler
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4a7217b05c232484a80abc7bd67494996dd32057
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 2 21:45:00 2013 +0000
+
+ sna: Discard bo->exec when unwinding a glyph no-op
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit add663919eb6aca1f5bbb39549d56f481ea0f273
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 2 21:13:45 2013 +0000
+
+ sna: Eliminate the redundancy between is_mappable/can_map
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d41f847c75c3bce85fda6e7508995b45679944e8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 2 21:01:26 2013 +0000
+
+ sna: Jump to the right escape target when bypassing a self-copy
+
+ Another fix for
+
+ commit e3f15cbf39696edae9f716bdcfbb7032ec7d7e3f [2.99.905]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Tue Oct 22 15:19:15 2013 +0100
+
+ sna: Move gc back to GPU after failure to move it to CPU
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7c143ba65cebfad08a32ee28c0dfb4f6635bf94c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 2 15:12:51 2013 +0000
+
+ sna: Add some more asserts around inactive VMA lists
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1c34ea0894e42bf344b0edad62cf2e142840af88
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 2 14:43:49 2013 +0000
+
+ sna: Tweak estimate of maximum usable aperture for strict fencing
+
+ Old generations have very strict alignment requirements even for
+ unfenced tiled accesses which restricts the amount of aperture space
+ available for use, and in the process estimate for the effect of
+ framebuffer fragmentation on the mappable aperture.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d507b6b9825cc18f41911727ef2ba9b9593cfe21
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 30 16:28:02 2012 +0000
+
+ Prepare for changes in the BLT unit on future generations
+
+ Adapt the legacy BLT commands in preparation for future changes.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9681b1422e4531a19e0117e1b1a97668f6b6a571
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Nov 2 13:11:31 2013 +0000
+
+ sna: Fallback when wedged and trying to use the BLT copy routines
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6cb84c8d55f2f7cbb087a479c1dbc8bc58e97183
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 1 15:57:56 2013 +0000
+
+ sna: Guard the replace-with-xor fallback path
+
+ Before attempting to map the destination for uploading into after a
+ failure to use the BLT, we need to recheck that it is indeed mappable.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=70924
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5da329735ca79517a326aee002685bf33e8db861
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 1 14:30:14 2013 +0000
+
+ sna: Process all clip boxes when rastering segments
+
+ The macro still had buried returns which were no longer valid after the
+ translation to handle clipping. They needed to be breaks from the inner
+ most loops to the outer clip box instead.
+
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70802
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0d93b0ef343a635512c3835c797c469c17a7b584
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 1 12:49:36 2013 +0000
+
+ sna/gen7: Undo overzealous flushing
+
+ commit d580a30aaf97687f9669ea72fbc3310c2fea26f1
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Thu Oct 31 15:58:47 2013 +0000
+
+ sna/gen7: Flush render cache when changing CC state
+
+ ultimately doesn't prevent the issue and in the process adversely
+ affects perforamnce.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6b1a6f32179f7bff8503c6b8b38351a7cf1d08b7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 1 10:48:06 2013 +0000
+
+ sna: Scale uses of aperture_mappable by PAGE_SIZE
+
+ After converting aperture_mappable to count in pages, there were a few
+ residual users expecting a byte count.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71117
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d580a30aaf97687f9669ea72fbc3310c2fea26f1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Oct 31 15:58:47 2013 +0000
+
+ sna/gen7: Flush render cache when changing CC state
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=68410
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 82e6d41c2f4f343bd1854d3d8ee4b624b5d68971
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Oct 31 13:35:59 2013 +0000
+
+ sna/gen6: Tweak flush around CC state changes
+
+ In order to fix some font corruption, it appears that we need an extra
+ flush in the Sandybridge pipeline when we change the CC stage and the
+ render cache is dirty. We previously triggered a full pipeline stall
+ for this case.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5cdc2bbc9c66d4c8c6fdb1b552c32177d070bf7b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Oct 31 10:32:46 2013 +0000
+
+ sna: Tweak deletion of used buffers
+
+ Make sure we never unwind a used buffer.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ed16e34c00d5eb5ca4ec643f66fedbf1a5112e90
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 30 18:48:10 2013 +0000
+
+ sna: Allow limited recursion within sigtrapped routines
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 426efd5f4bb311eeec86de40815b6bc2c6914e94
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 30 18:42:06 2013 +0000
+
+ Revert "sna: Detect and handle mi recursion"
+
+ This reverts commit c6b0e3fe0c299488932ba0392847f1faf298d079.
+
+commit ed282456240cc0a7ae9a235ea8aea14a8b8a54ef
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 30 13:26:23 2013 +0000
+
+ sna: Assert that the batch is in the correct mode prior to inserting BLT commands
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c6b0e3fe0c299488932ba0392847f1faf298d079
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 30 11:52:05 2013 +0000
+
+ sna: Detect and handle mi recursion
+
+ Some of the mi routines recuse back into the generic accel routines and
+ so confuse our trapping of SIGBUS. Add extra assertions to pinpoint the
+ recursion and unwrap sufficiently to avoid that recursion.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4d13d52258702f2581ca4f695b69e4dc8f510581
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 30 10:02:28 2013 +0000
+
+ sna: Queue retirement when placing a BO on the deferred flushing list
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 59531ba31aa479497cb76b67ea972d1cfa6aec79
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 30 09:55:57 2013 +0000
+
+ sna: Check for wedged after submitting
+
+ If we submit prior to an operation, check that we didn't just wedge the
+ GPU.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 87655e7df4847542db8da6c8b61006c95b936185
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 21:19:02 2013 +0000
+
+ sna: Wrap access of upload buffers with sigtrap
+
+ For an extra layer of paranoia, catch any sigbus when trying to upload
+ a bitmap, and convert it to a no-op.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0e692800055827cf526c7539515c71aecb58bf30
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 20:16:06 2013 +0000
+
+ sna/gen7: Refactor BYT vsync using IVB routines
+
+ The BYT vsync is closer to the IVB vsync, and using gen6 is just
+ erroneous. Apparently. At least that is what is in bspec today.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9352769eee0889dd1c1656829c140384a9e94bcf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 18:27:41 2013 +0000
+
+ sna: Fix assertion checks for fake flushing requests
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit eddd80c44dbb21769cbd100b8cfb0f38d1606e86
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 18:00:49 2013 +0000
+
+ sna: Remove an overzealous assert
+
+ Testing with a slow gen2 triggers this harmless assertion, so drop it.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9f36e83d76eb6ef26539fc37ce9ebd08428c48a3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 16:59:57 2013 +0000
+
+ sna: Handle deferred retiring of active-buffers
+
+ Yikes, the new assertions found cases where we would retain an active
+ buffer even though it was still owned by the next batch. Fortunately,
+ this should only be a bookkeeping issue rather than lead to corruption.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d26036d40e77e8f40c8d08659f95a8a5dfac07ed
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 16:20:14 2013 +0000
+
+ sna: Always run the retire_buffers during ring_idle
+
+ As we know that we had a request to retire, we know that we may make
+ progress retiring active buffers.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 72544ad5d11c2563d544ef1f7b25de2b3ab21295
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 14:53:02 2013 +0000
+
+ sna: Perform an explicit retire for old active upload buffers
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d86b36dc41f2e6744a4dea9286634cdf7989fa71
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 29 15:12:17 2013 +0000
+
+ sna: Check for retired upload buffers after checking for an idle ring
Reply to: