xserver-xorg-video-intel: Changes to 'debian-experimental'
debian/changelog | 7
debian/upstream.changelog | 2834 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 2841 insertions(+)
New commits:
commit 47c91e03d5e8de962841698d1f0c772ce277f695
Author: Vincent Cheng <vcheng@debian.org>
Date: Wed Jul 23 22:56:18 2014 -0700
update upstream changelog
diff --git a/debian/changelog b/debian/changelog
index c9d56a1..f9e01bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-intel (2:2.99.914-1~exp1) UNRELEASED; urgency=medium
* New upstream prerelease 2.99.914.
+ * Update upstream changelog.
-- Vincent Cheng <vcheng@debian.org> Wed, 23 Jul 2014 22:49:08 -0700
diff --git a/debian/upstream.changelog b/debian/upstream.changelog
index 80bee27..6aac4d2 100644
--- a/debian/upstream.changelog
+++ b/debian/upstream.changelog
@@ -1,3 +1,2837 @@
+commit 8d95e90b7b4bf5d6bae5443f92d77d30f4443f24
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 15:45:31 2014 +0100
+
+ 2.99.914 snapshot
+
+commit 57f0e65d5186412835f282af59141626e4a87a00
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 16:42:46 2014 +0100
+
+ sna/dri2: Compile fix for old xorg/dri2
+
+ We have to do conditional compilation as we touch structure members that
+ may not exist in older Xserver headers.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4ed0937640b54246440421114b697f75d1b8c835
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 15:41:29 2014 +0100
+
+ Add automake magic required for libobj/
+
+ So libobj/ wasn't included in the tarball, and nor was the compatability
+ functions being added to the driver when they were needed. The oddity is
+ that using the ./configure script (and thus make distcheck) succeeds. It
+ was only when 'autoreconf -fi' was run was the first error encoutered.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reported-by: Tobias Klausmann
+
+commit dcf9ce4a9f16c01f58797e4f899d51e23506aa6c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 14:19:44 2014 +0000
+
+ Fix compile failure on old Xorg with XF86_ALLOCATE_GPU_SCREEN
+
+ Sigh, a late fix was not compile checked against xorg-1.7.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1c5e20716f192f0c38b4edd879d28e11126f7f01
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jul 5 08:47:16 2014 +0100
+
+ 2.99.913 snapshot
+
+commit d242965979cf251383a6230dbd65cdc1d9e231ea
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 14:25:25 2014 +0100
+
+ sna: Skip performing an async flip after fixup
+
+ After the first async failure and we fix up the CRTC, ordinary we queue
+ a no-op flip in order to queue the event. For async flips, we do not
+ want that event so just skip the flip.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4153d4b43004cd90c0d9a7a7db399dac4d30721e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 13:54:19 2014 +0100
+
+ sna/dri2: Tidy freeing the queued frame events
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f2b2b6eda009924e5ec6974bb31be9d3749c9cf8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 13:45:27 2014 +0100
+
+ test/dri2: Use the right device node
+
+ Use the device node as instructed by Xorg.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 65c2376730e86d7502d8c47d49386be5f51e47ba
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 12:12:03 2014 +0100
+
+ sna: Add a DBG message for slave damage propagation
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 95c059b330e705ecd0e575e98d8edf5707e84a05
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 11:01:07 2014 +0100
+
+ sna: Reorder disabling scanout pixmap when updating slave
+
+ The assertion caught that we would unregister an invalid drawable on
+ older Xorg.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d6830190bc9956f485db6c3420f7a4a79793a693
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 10:53:40 2014 +0100
+
+ sna: Disable all outputs when initializing as a slaved output provider
+
+ When we are constructed as a slaved device, we need to disable all
+ outputs or else they are not correctly hooked into the master device
+ upon startup.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 70868c7aa881b15b7478f7ee4543fde0268a4ba6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 23 08:37:46 2014 +0100
+
+ sna/dri2: Recreate buffer in reuse rather than force recreate
+
+ By marking the buffer->attachment as invalid we forced the recreation of
+ the buffer on the next DRI2GetBuffers. The only small problem with that
+ was that the client didn't always immediately call DRI2GetBuffers after
+ the invalidation - and if they did a DRI2CopyRegion with its stale
+ buffers the unfound attachment would generate a BadValue and kill the
+ client. So instead of messing around with the attachment, explicitly
+ recreate the buffer if we attempt to reuse a buffer of the wrong size.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit aa5351dbbe0a50080efee35a3d494b3a20b7c9f6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 22 09:40:14 2014 +0100
+
+ sna: Ensure errno is set after failure before reporting a modeset failure
+
+ A few paths we report a sanity check failure which do not set errno, but
+ we then print out the errno as part of our message to the user. Set it
+ to a sane value in those cases.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit feba651db8dd61356fb6296b55d46168bd4d7011
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 22 09:15:01 2014 +0100
+
+ sna: Remove %# from DBG messages
+
+ LogF doesn't support the 0x-prefix instruction.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 13e20c7f61d8b21b33c02d8b737cf9c06bf50f17
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 22 08:52:10 2014 +0100
+
+ sna: Assert that we do not overwrite an earlier COW entry
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d8b0a8fa033848543e0b39566b531fdfdd078087
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 22 08:48:58 2014 +0100
+
+ sna/dri3: Don't forget to add SHM pixmaps to the list of exported DRI3 bo
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit bfccacf745d054756661be3edd8898ac6aceb878
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jul 20 07:29:21 2014 +0100
+
+ sna/video: Bump the maximum size for sprites
+
+ A sprite plane is limited by the display engine who's maximum resolution
+ has increased since the 2kx2k limitations of 8xx, so let's set it
+ correctly to the reported maximum CRTC size (since we have no individual
+ query for maximum sprite plane sizes).
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9bb2818a7db1c9dc89379996415511b6cff4bb33
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jul 20 07:27:58 2014 +0100
+
+ dri3-test: Print line number for shm failures
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4ae346e7647fd2c01324f1a6d3b37674e858486d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 18 07:31:25 2014 +0100
+
+ configure: Double check xinerama's headers
+
+ Having the pkgconfig present doesn't always necessarily imply the
+ headers are installed correctly - just fail over gracefully for xinerama
+ and intel-virtual-output
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fac6845820e49dbbea2a625b7bb745d8f9159b56
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 18 07:14:19 2014 +0100
+
+ sna/dri2: Protect compsiteext.h include with build check
+
+ We shouldn't include calls to the composite extension if it has not been
+ built.
+
+ Reported-by: Ben Widawsky <ben@bwidawsk.net>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 923e098f5f830c30b93d6f85d4f812201bdcb206
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 17:10:39 2014 +0100
+
+ sna: Fix compilation with older Xorg
+
+ sna_display.c: In function 'sna_crtc_disable_shadow':
+ sna_display.c:1375:39: error: dereferencing pointer to incomplete type
+ DamageUnregister(&crtc->slave_damage->drawable, crtc->slave_damage);
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7026ffe56005bbc36dc37cafc7ebb2a7f09fefdd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 17:04:02 2014 +0100
+
+ sna: Support TearFree on slaved outputs
+
+ By always forcing the shadow intermediatory, we can enable TearFree even
+ ona slave scanout.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3140d72826b5227f7f7ac9a428faa4bcfd4b377b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 16:14:16 2014 +0100
+
+ backlight: Prevent dereference of potential NULL argv
+
+ Adam Sampson spotted that
+
+ "It's possible (but not very sensible) to exec a program with an empty
+ argument list, so argv[0] is not necessarily a valid pointer. For
+ example:
+
+ $ cat exec0.c
+
+ int main(int argc, char *argv[]) {
+ char *empty[1] = { NULL };
+ execvp(argv[1], empty);
+ perror("execvp");
+ return 1;
+ }
+ $ ./exec0 /usr/libexec/xf86-video-intel-backlight-helper
+ Usage: (null) <iface>
+ "
+
+ He sensibly suggested that we hardcode the program name to avoid the
+ NULL dereference. Being the paranoid type, we should also be careful not
+ to write to any file descriptors outside of our control (i.e. stderr),
+ so disable the messages unless we are debugging.
+
+ Reported-by: Adam Sampson
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit bcd09ff6eb76bc4df046ece4da29b1455fed8dff
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 15:23:46 2014 +0100
+
+ sna: Assert that we never attempt to flip the slave scanout
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 129656e4a82d4bf799e5c1d75d0dcb4480f6eb09
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 15:01:06 2014 +0100
+
+ sna/dri2: Disable SwapLimit buffers with buggy prime implementations
+
+ If there is a GPU screen, we have to assume that the DRI2 code may pass
+ around the wrong pointers to ReuseBufferNotify until the fix is
+ released:
+
+ commit 4d92fab39c4225e89f2d157a1f559cb0618a6eaa
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Wed Jun 18 11:14:43 2014 +0100
+
+ dri2: Use the PrimeScreen when creating/reusing buffers
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a45b2ea11c15f35c36330ff27cb45854a29c2e2c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 14:40:51 2014 +0100
+
+ sna: Handle rotated slaved scanouts
+
+ As per the usual handling of rotated scanouts with unsupported
+ rotations, we stage the drawing onto a backbuffer then rotate onto the
+ crtc later. The difference here is that we must read the contents from
+ the master pixmap rather than our own screen pixmap.
+
+ Spotted was looking at slaved scanouts mistakenly setting the CRTC
+ transformed flag.
+
+ Reported-by: Tomas Pruzina <pruzinat@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81383
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 339c9dd0d5206180995731ab22304776e544f2f7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 12:54:47 2014 +0100
+
+ sna: Add missing DBG parameters
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 62f62f70eda97a3ef18c5144031fdf1cb2b7dad0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 10:06:06 2014 +0100
+
+ sna: Avoid confusing failure to flip and flipping zero CRTC
+
+ During the present unflip path we blindly try to restore the original
+ mode after a flip failure. However, it confuses flipping zero CRTC with
+ a genuine failure. This has the result of undoing a DPMS change (e.g.
+ xset dpms force dpms) under a DRI3 compositor.
+
+ Reported-by: Jiri Slaby <jirislaby@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81456
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 95f08c171ebd9b594112ab006c4460702a22bec1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 09:20:35 2014 +0100
+
+ sna: Busy-wait for the kernel to catch up when flipping
+
+ If the kernel reports that it is busy, it has not yet finished
+ processing a pending flip and we have multiple CRTC queued, just wait
+ for the kernel to clear its backlog before submitting the next flip. On
+ the other hand, if we can just overwrite the pending flip results.
+ However, the EBUSY may actually be a genuine report by the kernel of an
+ error, so check for an invalid CRTC first.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0a9d3dd8c83749992e643675f16486092f2b00fa
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 08:53:13 2014 +0100
+
+ sna: Silence valgrind when reading plane properties
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0a57b55f0fcfa93b38015535002cb11eeaf1dd3a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 17 08:32:14 2014 +0100
+
+ sna: Remove extraneous function wrapping
+
+ Since we only have the single callsite for do_page_flip, the wrapper is
+ not adding any meaningful information.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f33d44f41ef0f287375b7a6b1c117abff5a23b19
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 16 12:53:02 2014 +0100
+
+ sna: And remove new bogus assertion
+
+ We assert that damage is valid as we delete the Pixmap, and so we cannot
+ assert that the Pixmap is still valid itself.
+
+ Reported-by: Jiri Slaby <jirislaby@gmail.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit dd9df24eb5234c96e499063904ab7bd85a332fd8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 16 08:05:34 2014 +0100
+
+ sna: Make the damage check more verbose
+
+ Print out the pixmap number and the damage extents for when the
+ assertion fails.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 34ada63118680bf8ad2ef737fd4a8edfd8246e37
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 16 07:19:03 2014 +0100
+
+ sna/gen2+: Remove assertion on draw->type for fills
+
+ I overlooked the tiling-fill path passing down a temporary DrawableRec
+ into the fill_boxes callback - invalidating the assertion.
+
+ Fixes regression from
+ commit 43176b9bfafe389c4b9ed676f4e50e3b06f858c4
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Mon Jun 30 21:01:11 2014 +0100
+
+ sna/dri2: Pass around the correct DrawableRec for sampling from the foriegn bo
+
+ Reported-by: Jiri Slaby <jirislaby@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c62
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4422b1854209a2cdf023c1fbc60834fde2fbc0c7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 11 22:23:55 2014 +0100
+
+ sna: Use a stricter test for determining CRTC off before updating the cursor
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e0523ade28fa0da00d0bd70d8b22d53ed4e49f73
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 9 12:10:15 2014 +0100
+
+ sna: Reduce reflections onto rotations
+
+ In order to support a wider range of rotation/reflections, perform a
+ simple reduction of the requested rotation first.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 251bcc32eed37ee10eb14ce2278ecbdcc40a7cde
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 10 21:01:57 2014 +0100
+
+ configure: Provide a poor man's replacement for getline()
+
+ uClibc is one such library that doesn't implement getline()
+
+ Reported-by: Ben Widawsky <benjamin.widawsky@intel.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8587b2fff218537c6ff568ac3ef561f0d39f03ff
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 8 11:53:13 2014 +0100
+
+ sna: Rewrite rotation setup on top of universal drm planes
+
+ The kernel interface has changed slightly since the early proposals. Now
+ the rotation property is only on the plane and so we have to lookup the
+ primary prime as well.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f24a9d335273fec20679397abcc3d5405d9613df
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jul 5 14:40:38 2014 +0100
+
+ sna: Fix a couple of DBG messages
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 790e7492bdb5c0c77c53ae769f0d408b04d5c99b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jul 5 09:46:00 2014 +0100
+
+ test/lowlevel-blt-bench: Add common PDF operators
+
+ Applications are starting to use PDF operators, so far I have spotted
+ multiply, dodge and lighten.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8fa22964f69d3ec8700f177dd7cb3cbc396a9f35
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Fri Jul 4 18:26:09 2014 +0200
+
+ backlight: Fix security issues in handling of the interface path name.
+
+ - don't allow '/' in the interface name to avoid escaping the /sys
+ hierarchy
+ - check snprintf() return value for overflow.
+
+ Problems reported by Adam Sampson. Thanks.
+
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+ Reviewed-by: Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 6a64a3ae55ad5f743d2b7a4852b6ca7b54d2a142
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 13:04:02 2014 +0100
+
+ sna: Discard operations to either CPU or GPU bo when overwriting with RenderRectangles
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2c8ab77fcd71b7f96ad7bc379e5c68b3b45a5069
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 12:43:55 2014 +0100
+
+ sna: Tweak number of threads for short areas
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d3ccb3f3b2a3cb4c8b51d58d185dd10b85e025eb
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 12:39:01 2014 +0100
+
+ sna: Convert a clear tile into a solid fill
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2e0763088f8e159b414cec5c056cc4c91a34766e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 12:26:43 2014 +0100
+
+ sna: Fix typo s/num_threads/max_threads/
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 04ddea075e9e07cf3158594130d5ba7d1f50f7f1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 12:14:11 2014 +0100
+
+ sna: Do a quirk early check for short areas before threading
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 228a22fe8db044a18556a9fdb989323274817771
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 12:10:10 2014 +0100
+
+ sna: Disable use of threaded compositor when using threaded renderer
+
+ Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 64bcb91f58fba3956f2c66fa37707b9e496da936
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 11:02:39 2014 +0100
+
+ sna: Utilise existing cached upload for promoting to GPU bo
+
+ If we already have a buffer that represents the data on the GPU, we can
+ simply use that when we need to promote the pixmap onto the GPU.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 821ef20b27f84cc26aec266b0f616a7f39ba9e3d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 10:43:35 2014 +0100
+
+ sna: Promote tile pixmaps to GPU when reused
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c6407f7380829f822a462100d26bc531aed0fd6f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 10:14:54 2014 +0100
+
+ sna/gen8: Disable the unaligned check
+
+ Note sure if this is strictly required -- but at the moment it fails for
+ 1x1R solids, causing us to skip glyphs. The simulator doesn't complain,
+ so just skip the check for now.
+
+ Reported-by: Ben Widawsky <ben@bwidawsk.net>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e64d14d7bc72fe7b150e5427feeb1a163ec600a7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 09:55:04 2014 +0100
+
+ sna: Tighten assertions for using upload proxies concurrently with CPU reads
+
+ After relaxing some of the rules on when to discard the upload proxies,
+ we also need to relax some of the complementary asserts.
+
+ Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4e12d5ca26bdfafd7b9cd02c36e6d991f068f29b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 4 09:48:53 2014 +0100
+
+ sna: Prevent creating a GPU bo for an inplace read
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 18ae7722dbdf6ab61560962ed6ca8d39f353b1f9
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 3 18:18:04 2014 +0000
+
+ sna: Wrap xf86DPMSSet
+
+ We need to wrap xf86DPMSSet() so that we can reintialize our bookkeeping
+ and auxiliary planes after disabling/re-enabling CRTC during DPMS
+ operations.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 57d0cc82d851b95d4e3b1821287dd3ffd1cf6e3b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 3 09:07:44 2014 +0100
+
+ sna: Clear the cursor reference from the CRTC if the update fails
+
+ This should allow it to be restored correctly the next time it gets
+ shown.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 24c9bac7eb6e17b55044d719bab74d16fd68c450
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 2 21:17:54 2014 +0100
+
+ sna: Limit the size of the tiling object to be smaller than either the originals
+
+ When we tile, we do so in order to fit an operation involving two
+ objects larger than the aperture. If we then choose an intermediate
+ tiling object that is larger than either of those two, the error will
+ persist and we will be forced to recuse.
+
+ In the worst case, this will provide an upper bound to the recursion.
+
+ Reported-by: Bruno Prémont <bonbons@linux-vserver.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 710bb0d37c681f2ffdeaf263b6ee7d9488670bc0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 2 09:16:07 2014 +0000
+
+ test: Create separate SHM segments for ref/out
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 87e659b887f4c738cfc91439efdac0d48fd294f0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 2 10:47:32 2014 +0000
+
+ sna: Use the threaded compositor for picture conversions
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2bf36d54ebdfa2a59bf7ef71134b953628ae5d50
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 2 11:31:54 2014 +0100
+
+ sna/gen6+: Tweak consideration of compositing on BLT
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 732cd11cf0ca813fdc06f9f09fab120ea4e3a7da
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 1 17:54:49 2014 +0100
+
+ sna: Fix typo in LinearFramebuffer handling
+
+ Eeek, when not using LinearFramebuffer we still want to create the GPU
+ bo: s/,/;/
+
+ Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b5fa463b90c49ebc635d79b1561c94a4857e9cf6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 1 17:53:56 2014 +0100
+
+ sna: Correct migration flags for initial scanout creation
+
+ We want to preserve any contents preloaded (not that there should be
+ any...)
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b88866aa5ebf813a999e194dec24e9ef2ac4f59d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 1 16:59:31 2014 +0100
+
+ sna/dri2: Add a DBG option to select copy method
+
+ Often when debugging it is useful to force either use of the BLT or 3D
+ pipelines for copies.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a10781b70f222f3997928fa979f6292617f79316
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 1 15:11:07 2014 +0100
+
+ sna: Enforce LinearFramebuffer option
+
+ This option should only be used for compatibility. Previously this was
+ done at a high level, this changes it to enforce the tiling as we apply
+ the CRTC.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 75745cd5861481c5a9a31125d357f339349dd0f8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 1 14:31:32 2014 +0100
+
+ sna/dri2: Use CPU fallback if possible
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 02715490db13dcd47c5e4bef713f400838d94b99
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 1 13:10:32 2014 +0100
+
+ sna/dri2: Set depth/bpp on scratch DrawableRec
+
+ We need to initialise both depth and bitsPerPixel on the drawable struct
+ we pass around as they are used for selecting for the format when
+ copying.
+
+ Reported-by: Vedran Rodic <vrodic@gmail.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e6e5330857097eb2caafa89d571d12e4bb15f539
+Author: Damien Lespiau <damien.lespiau@intel.com>
+Date: Mon Jun 30 19:24:13 2014 +0100
+
+ intel: Use the i845 info structure for INTEL_I845G_IDS()
+
+ I assume the intention was to provide a different structure for each of
+ the gen 2 devices.
+
+ This doesn't change anything really.
+
+ Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
+
+commit e1c3e6ce79c73d12c814cfda76dbc0df184902ee
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 19:56:39 2014 +0100
+
+ sna: Add DBG breadcrumbs before flushes in BLT
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 43176b9bfafe389c4b9ed676f4e50e3b06f858c4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 21:01:11 2014 +0100
+
+ sna/dri2: Pass around the correct DrawableRec for sampling from the foriegn bo
+
+ One day, we will move the width/height/bpp to the bo itself...
+
+ Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6c3399715e316be970c696b8949e3c14e83ea5df
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 16:32:45 2014 +0100
+
+ sna/dri2: Apply the paraniod buffer clip in the correct coordinate system
+
+ We need to only clip to the extents of the copy in the buffer space -
+ which implies that we need to translate the region into that space before
+ doing the clip.
+
+ Reported-by: Ilia Mirkin <imirkin@alum.mit.edu>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c25fa2216a3674f564a7e35d263a5d405aa97816
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 14:13:13 2014 +0100
+
+ sna: Tweak preference for small GPU bo
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 19a62e088f5202026bdfde7a8af36598b69f8243
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 11:20:54 2014 +0100
+
+ test/lowlevel-blt-bench: Update progress more frequently
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fab3bc70a450d94104c96ddbe7fa6e6ace1bb8f8
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 11:05:33 2014 +0100
+
+ sna: Reduce assertion when using asynchronous CPU access
+
+ If we are not actually accessing the memory through the pointer, we do
+ not care if it not currently coherent.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ffe8bd4d6e296a0ded0e118aee05aa6cb3051c56
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 10:55:20 2014 +0100
+
+ sna: Silence snarky compliers
+
+ 0 != (void *)0
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 05f6183075867d582b7f9f74aec42e632e3d83dd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 10:46:00 2014 +0100
+
+ sna: Mollify assert to be consistent with the scanout flush
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2e0000688d034535083950b98bc61745dd965352
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 08:44:33 2014 +0100
+
+ test/lowlevel-blt-bench: Exercise masks
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 37ac34c4e4500bfc272222754949edc1dbb8c7e2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 08:44:33 2014 +0100
+
+ test/lowlevel-blt-bench: Exercise SHM pixmaps
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 901d889dd7397dfa4c291f96af657e4b3433d795
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 30 07:44:25 2014 +0100
+
+ intel-virtual-output: Remove one redundant cleanup on error
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a8b0ba0ed5f27e0d671b650d6f4bfe2fd86a0f3f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 29 15:25:19 2014 +0100
+
+ intel-virtual-output: Cleanup singleton on failure
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 81889664851e3a2218d1ac5d39ebd2bd3b6a4954
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 29 08:29:36 2014 +0100
+
+ intel-virtual-output: Convert debugging messages to verbosity
+
+ Original patch by main.haarp:
+ "A verbose switch is quite useful for debugging, it shouldn't require
+ editing and recompilation to gain more useful output. I added it."
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80664
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 665d012b8e1b9666e535a3081404406f31b8a3ef
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 29 09:26:10 2014 +0100
+
+ sna: Ensure CPU bo is synchronized before writing
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6b906ae742ec96eeef403191d3cdded6a23a70b7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 29 07:02:44 2014 +0100
+
+ sna: Update allocation of CPU bo to avoid creating active buffers
+
+ Since we now prefer CPU detiling, exactly when we want active/inactive
+ buffers is a little more complex - and we also need to take into account
+ when we want to use the CPU bo as a render target.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b961d7323369284ea2c3db47d30c27ffe01a9040
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 29 07:00:58 2014 +0100
+
+ sna: Sync CPU bo before writes
+
+ Fixes regression from
+
+ commit 961139f5878572ebea268a0bbf47caf05af9093f [2.99.912]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Fri May 30 09:45:15 2014 +0100
+
+ sna: Use manual detiling for downloads
+
+ Reported-by: Harald Judt <h.judt@gmx.at>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80560
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 53ef9e762a6e7802b3d5f8fba9ac17ff95545c10
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 21:07:08 2014 +0100
+
+ sna: Only preferentially upload through the GTT for large transfers
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0955f12ae04011593b71817e3151b8fb7c228899
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 17:38:54 2014 +0100
+
+ sna: Prefer linear if below tile_width
+
+ Be stricter in order to allow greater use of CPU bo.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3ef966f4c5bae07108ce2720f4da3c3c4e41e1aa
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 14:23:29 2014 +0100
+
+ sna/io: Prefer CPU copies on LLC
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9fc052da5c4246402d2707b3a91efffa7dd81e08
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 14:22:17 2014 +0100
+
+ sna: Don't discard damage for SHM pixmaps
+
+ We don't really want to rendering into SHM pixmaps except for copying
+ back due to the strict serialisation requirements.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0f8b39d24ff15cf3373ac7293f12772ebe16b68b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 14:21:36 2014 +0100
+
+ sna: Check for a mappable GPU bo before migrating damage
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit cfdaee4a7e45689b0fbbc8c3166d28d69797e759
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 14:20:00 2014 +0100
+
+ sna: Skip adding damage if it is already contained
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 80752fb2794faa581d891b24148eaf51c42afd25
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 14:19:22 2014 +0100
+
+ sna: Tidy calling memcpy_from_tiled
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2a0176379f0ff290d276adc72d44dfddafd96da5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 14:18:23 2014 +0100
+
+ sna: Micro-optimise unswizzling tiling/detiling
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 24cb50e53c789cb7a05d59ad103dda1c3a009485
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 28 07:05:55 2014 +0100
+
+ sna/trapezoids: Handle mono traps just in case
+
+ I disabled a few paths and ended up in an assert that mono trapezoids
+ shouldn't get that far...
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 72c041e57b99367f327c51c50fce2a55d618fc63
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jun 27 16:26:24 2014 +0100
+
+ uxa: Update Screen Pixmap width/height first
+
Reply to: