Rebased ref, commits from common ancestor: commit ae9622b90d816dcfdb7f47ad0cb2108532d4011b Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:34:17 2012 +0100
Upload to experimental. diff --git a/debian/changelog b/debian/changelog index eeb97d7..05931e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.17.0+git20120101-1) UNRELEASED; urgency=low +xserver-xorg-video-intel (2:2.17.0+git20120101-1) experimental; urgency=low * New upstream snapshot: - Merge from upstream master up to 770a953ff0. @@ -8,7 +8,7 @@ xserver-xorg-video-intel (2:2.17.0+git20120101-1) UNRELEASED; urgency=low - 0001-Fix-build-failure-when-passing-with-builderstring.patch * Pass a builder string, as done in the server. - -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:19:40 +0100 + -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:34:09 +0100 xserver-xorg-video-intel (2:2.17.0-1) unstable; urgency=low commit 78a3a0eede1b015057a97fc1ff757113d723eaf0 Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:29:34 2012 +0100 Pass a builder string, as done in the server. diff --git a/debian/changelog b/debian/changelog index 6e9b45b..eeb97d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-video-intel (2:2.17.0+git20120101-1) UNRELEASED; urgency=low and regression reports are welcome. * Add patch to support passing a builder string: - 0001-Fix-build-failure-when-passing-with-builderstring.patch + * Pass a builder string, as done in the server. -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:19:40 +0100 diff --git a/debian/rules b/debian/rules index a2d9d7a..c5098e2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,12 @@ #!/usr/bin/make -f -# Enable SNA: +SOURCE_NAME := $(shell dpkg-parsechangelog | awk -F': ' '/^Source: / {print $$2}') +SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print $$2}') +BUILDER := $(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {print $$2}') + +# Enable SNA, pass builderstring: override_dh_auto_configure: - dh_auto_configure -- --enable-sna + dh_auto_configure -- --enable-sna --with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: commit 5e63f8493a9f1d440a896d6bb6618bae316255e5 Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:25:40 2012 +0100 Add patch to support passing a builder string. diff --git a/debian/changelog b/debian/changelog index 163b085..6e9b45b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ xserver-xorg-video-intel (2:2.17.0+git20120101-1) UNRELEASED; urgency=low - Merge from upstream master up to 770a953ff0. * Enable SNA support, as suggested by upstream. It should be usable now and regression reports are welcome. + * Add patch to support passing a builder string: + - 0001-Fix-build-failure-when-passing-with-builderstring.patch -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:19:40 +0100 diff --git a/debian/patches/0001-Fix-build-failure-when-passing-with-builderstring.patch b/debian/patches/0001-Fix-build-failure-when-passing-with-builderstring.patch new file mode 100644 index 0000000..6281d3a --- /dev/null +++ b/debian/patches/0001-Fix-build-failure-when-passing-with-builderstring.patch @@ -0,0 +1,33 @@ +From d96feed041266a7629e4839e1294f3074679891a Mon Sep 17 00:00:00 2001 +From: Cyril Brulebois <k...@debian.org> +Date: Mon, 7 Nov 2011 23:29:29 +0100 +Subject: [PATCH] Fix build failure when passing --with-builderstring. + +If --with-builderstring="foo" is passed to configure (and sna enabled): + CC sna_driver.lo +src/sna/sna_driver.c: In function 'sna_init_scrn': +src/sna/sna_driver.c:1023:7: error: token ""foo"" is not valid in preprocessor expressions + +Fix the missing defined() around the BUILDER_DESCRIPTION variable. + +Signed-off-by: Cyril Brulebois <k...@debian.org> +--- + src/sna/sna_driver.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c +index 770a5bd..763a5a3 100644 +--- a/src/sna/sna_driver.c ++++ b/src/sna/sna_driver.c +@@ -1068,7 +1068,7 @@ void sna_init_scrn(ScrnInfoPtr scrn, int entity_num) + #if defined(USE_GIT_DESCRIBE) + xf86DrvMsg(scrn->scrnIndex, X_INFO, + "SNA compiled from %s\n", git_version); +-#elif BUILDER_DESCRIPTION ++#elif defined(BUILDER_DESCRIPTION) + xf86DrvMsg(scrn->scrnIndex, X_INFO, + "SNA compiled: %s\n", BUILDER_DESCRIPTION); + #endif +-- +1.7.7.3 + diff --git a/debian/patches/series b/debian/patches/series index fdffa2a..3569ab4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -# placeholder +0001-Fix-build-failure-when-passing-with-builderstring.patch commit b1878efc44236cb5f9944f9770271272fd548013 Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:23:17 2012 +0100 Enable SNA support, as suggested by upstream. It should be usable now and regression reports are welcome. diff --git a/debian/changelog b/debian/changelog index 8449e00..163b085 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xserver-xorg-video-intel (2:2.17.0+git20120101-1) UNRELEASED; urgency=low * New upstream snapshot: - Merge from upstream master up to 770a953ff0. + * Enable SNA support, as suggested by upstream. It should be usable now + and regression reports are welcome. -- Cyril Brulebois <k...@debian.org> Sun, 01 Jan 2012 06:19:40 +0100 diff --git a/debian/rules b/debian/rules index cfa32f5..a2d9d7a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f +# Enable SNA: +override_dh_auto_configure: + dh_auto_configure -- --enable-sna + # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit 9c95abe84d62a4c450037cfaf2168674aee4a8c1 Author: Cyril Brulebois <k...@debian.org> Date: Sun Jan 1 06:21:07 2012 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 6c4ac40..9443914 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,2791 @@ +commit 770a953ff03bb8328c3f29e274d225528840f30c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 17:19:08 2011 +0000 + + uxa/video: Clear all state structures before uploading + + A regression from eb859f644633e left some of the state uninitialised + before uploading to the GPU leading to undefined behaviour. + + Reported-by: Alexey Shumitsky <alexey.shumit...@gmail.com> + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44338 + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44252 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f1995c684d2e074ae04c9e42727e59cc77e16104 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 15:57:32 2011 +0000 + + uxa: the video destination should be in the render write domain + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 511146d2e40e267f74e18c0dd06b65f5d6a69f5d +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 13:27:13 2011 +0000 + + sna: Implement inplace trapezoidal addition (for clipmasks) + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit a1f585a3d0ae72e896684f62960a9ae96dc259f5 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 12:43:04 2011 +0000 + + sna: Update pixmap->devKind for GTT mappings + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 343de19ef98eea016601dbbe2d1f601dbff9de20 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 11:19:44 2011 +0000 + + sna: Implement tiled uploads for small stipples larger than patterns + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit fb15cf2294da20bfc375ae62443b822770850316 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 10:24:58 2011 +0000 + + sna: Make sure the shadow pixmap is suitable for scanout + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 281425551bdab7eb38ae167a3205b14ae3599c49 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 31 10:10:00 2011 +0000 + + sna: Tweak throttling to be run before going idle + + The goal is to avoid introducing extra latency in the middle of a + command sequence and to delay it until we have to wait for the clients. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 2f5448f1329f344702e4e29b2509d7190677bbf0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 30 22:13:05 2011 +0000 + + sna: compare tiling against minimum width for relevancy + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e82b3d8069629ae5776e039d6ea1f3c901a3a094 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 30 09:16:00 2011 +0000 + + sna: Defer the initial source upload if the GPU bo will be untiled + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 72624b0b5ba6549cb8d96f992d2656a28ec6078c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 22:43:35 2011 +0000 + + sna: Remove redundant use-gpu-bo clause + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6dc9bbc0161f071bbaf5c7e379974158a5ad666f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 22:43:44 2011 +0000 + + sna: Fix DBG for no intersection with damage + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0dc5c0651cb691fb8811cdf3075b3d322f9d37f8 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 13:49:23 2011 +0000 + + sna: Tune disarming of the scanout flush timer + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ccd895c61d9f409a36c70eaf02d7ab43cc6c03c2 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 12:09:04 2011 +0000 + + sna: Allow uploading inplace to a freshly created GPU bo + + If the operation is favoured to be performed using a WC upload, presume + that we will use the uploaded pixmap on the GPU and so prefer to create + a GPU buffer to hold the fresh data. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f85a853455249fd782e907ce1d78d11f75362def +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 11:59:57 2011 +0000 + + sna: Only update the damage region as necesary for contains-box + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f53936407bd68f3d36ab525b4e0531fad58098e3 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 11:59:37 2011 +0000 + + sna: Reset the source counter upon dirtying the shadow pixmap + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit c9f7f10bc528ac783f4e89bdb36fc56ccdcd0088 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 09:03:21 2011 +0000 + + sna: Be paranoid and check for errors from mmapping the bo + + Now that the error propagation is actually in place, we may as well use + it. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 98e053503aed292beb2006043e8508d59262c7c2 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 29 08:50:53 2011 +0000 + + uxa: Depend upon DRI2 not DRI + + The symbols required for building intel_dri.c are checked during + configure under the DRI2 defines. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 58cee9d0def82d19f03c840325b6e84c20e77ace +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 22:52:58 2011 +0000 + + sna/dri: Update set_bo() for change of bo ownership transfer during page-flip + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f9ee02be269d1658d3a8a5166e9bd2a49ab6dea0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 22:52:44 2011 +0000 + + sna: Fix debug message for read-boxes + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 698bd43e0f7a59bcce6601b0c96df85935e54bb3 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 21:45:12 2011 +0000 + + sna: Do not create glyph caches if the gpu is wedged + + As these will only be created in normal memory and never used. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 78425a15597079c0549de0fa1bbbdbebcf9eaf28 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 15:26:14 2011 +0000 + + sna: Refactor common code for testing gpu busyness of a pixmap + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 9105b7e03ab7e3602c7200ebdc44e89f873afe1f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 13:46:18 2011 +0000 + + sna: Perform clip mask compositing inplace + + Avoid the extra composite-in pass for simple clipmask construction. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit a5583165da0d2ae5eb1e5a2e11ee6e245d4b5aa4 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 13:57:09 2011 +0000 + + uxa: Remove concept of global FB ownership made obsolete by GEM and KMS + + With the introduction of GEM, we can continue to submit batch buffers + irrespective of ownership of the console, so do so. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 337635ab97bbfc9b4455eadb63214783bb90bb2b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 28 10:56:57 2011 +0000 + + sna: Add some more debugging to find the source of a read-boxes error + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 3bf81241cbc97763e5f3cbc82772437ccbff5a6c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 27 17:09:59 2011 +0000 + + sna: Skip zero-sized glyphs + + Similar to the empty glyphs make sure that we just advance by the + character width without drawing anything. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 8fc21328a0bdf87fde35d68d2b27834011acde7b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 27 15:26:46 2011 +0000 + + sna: Don't discard empty glyphs, just skip them + + A space is encoded as a 1x1 blank glyph, but we still need to advance by + its character width and so we cannot simply discard the glyph. + + References: https://bugs.freedesktop.org/show_bug.cgi?id=44091id=44091 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 726290ea2a54716d3d8fb998fe7d2ab252421de7 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 27 13:16:34 2011 +0000 + + sna: Rearrange damage for tail-call optimisations + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 04396b6e5039c0cd1ac655a8a9afe88bb8a1ebde +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 27 09:58:40 2011 +0000 + + sna: Don't force the creation of a GPU bo if it will be untiled + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 655a96cd5f12ff7fe593e7da5f34c7c92ef9b87d +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 26 14:37:37 2011 +0000 + + sna: Mark the glyph cache as being unpageable + + In order to prevent it falling foul of the inactive pixmap reaper, we + need to mark the pixmap as pinned. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 2934e778f01cdf1307732b248b11a31c0e79e866 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 26 11:30:39 2011 +0000 + + sna: Increase the minimum alignment constraint for g33 + + Still not getting the single-stream mode that I am aiming for! + + Reported-by: Matti Hamalainen <c...@tnsp.org> + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44150 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f7593a995a829978ce81397dde5c9ea6f9bb7681 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sun Dec 25 09:40:46 2011 +0000 + + sna: Move the is-mappable check into the callers of region_inplace() + + As they slightly differ in their requirements. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit aff32e3e08fce3c7b8dab3a25c96d69c409471fc +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sun Dec 25 00:36:33 2011 +0000 + + sna: Tweak damage not to reduce if it will not affect the outcome of reducing to all + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit be21a09fef0a3499153f2c123b65f1d5c872d437 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sun Dec 25 00:28:55 2011 +0000 + + sna: Only call move-to-gpu on scanout flush if we have cpu damage to move + + Reduce the number of redundant calls. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 7b69dc88094ee2bb017364cd4356f3ae69cbc1f1 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sun Dec 25 00:21:21 2011 +0000 + + sna: Inline the common portion of sna_get_pixel_from_rgba() + + The function overhead completely dominates for the common case. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit b117f65520919f4ba36010cfe913a8c53166bf23 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 21:03:01 2011 +0000 + + sna: Jump straight to the fallback copy routines if the dst is not attached + + Marginally simplify the convoluted logic for choosing the most + appropriate path and help prevent further errors. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 72217790ee2c080d618274456360b481d015e898 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 19:14:09 2011 +0000 + + sna: Use shadow if the GPU is busy or not immediately mappable + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0be136c21f0373d1eb2259b83c598655f4eb841e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 18:44:15 2011 +0000 + + sna: use indirect uploads if the bo was last known to be unmappable + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e764a52ee8f0c552e218b3110318be9ba06634ae +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 15:17:06 2011 +0000 + + sna: Encourage large operations to be migrated to the GPU + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f9f8535db6a9e3affba9ba2c2a9314dfe12ab270 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 21:01:39 2011 +0000 + + sna: Fix damage reduction by adding new boxes to the tail of the box list + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f8c91f229a9ca18fc58b0cabbea595d26627db8b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 12:17:53 2011 +0000 + + sna: We can always compare the box to be subtracted against the dirty extents + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit cc21d3fa045209861564cf240a9a082e0bdb63f8 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 12:17:43 2011 +0000 + + sna/damage: Fix the is-contained test + + It was a non-overlapping test which is almost the reverse of what was + intended. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit b86e4f59299f935d5a0ea8375da97e6fc57571f9 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 11:45:27 2011 +0000 + + sna: Check that the copy dst is attached before replacing damage + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 3bcc9f08e1309725c18dfa5ca0e905bb88ebf4ea +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 09:59:24 2011 +0000 + + sna: Create a GPU for a streaming write + + If we are about to do a write-only drawing operation that will exceed + our cache, allocate a GPU bo and perform the operation inplace. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit efc8d04fc114e9966e5ca00600f9663ecf03a5ca +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 09:32:18 2011 +0000 + + sna: Promote an unattached pixmap to the GPU for inplace copies + + If we would prefer to perform the copy on the GPU and if the pixmap is + virgin, create a GPU bo for the operation. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 8c0e7ff5ac996a5a5c0790966084d1c9e1b1f859 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 09:19:18 2011 +0000 + + sna: Clear the CPU damage for other overwriting rectangular blits as well + + And make the accessing of the sna_pixmap safe -- it may not even exist! + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 7f9ed3ca56466f319d9ec06aebb7055552fb1fe1 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 08:57:49 2011 +0000 + + sna: reset the pixmap on the initial clear after being swapped out + + Pixmaps are swapped out into the CPU after a period of inactivity. This + then prevents the core rendering routines from migrating the pixmap back + to the GPU until it gets used again on a Render path. However, we can + clear that CPU damage and enable migration before a number of key steps + in the expose process. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 8c987b6ccfa83b99a316a7da49a6d7e30fcdf295 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 09:09:58 2011 +0000 + + sna: Cheaply reduce damage when subtracting and removing the entire damage + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 098592ca5d79af2e4bdcd82ee598c4b2ba08df6b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 02:49:24 2011 +0000 + + sna: Remove the independent tracking of elts from boxes + + Following the switch to a global mode for damage, the elts array became + redundant and all that is required is the list of boxes. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 73df0c7ab7c3a9edf0be2439c7e7ab07c0d75ecf +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 02:48:18 2011 +0000 + + sna: Tune region upload inplace threshold + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ef66c5b5ad221211948ec795ade031591c3f0ac7 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 24 00:15:33 2011 +0000 + + sna: Search the inactive VMA cache first for a linear mapping + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 1cc07fa2d24b10ac95c7a84908290ec06539d447 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 20:31:21 2011 +0000 + + sna: Avoid forced creation of GPU bo for tiny operations and dirty pixmaps + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e5bfea5826117bdd29664d83b3d478ff9db29ca3 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 20:30:58 2011 +0000 + + sna: Discard any GPU damage when overwriting with trapezoids + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 819dc93e52533afc9b9005db1472672c3d42229f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 20:29:59 2011 +0000 + + sna/glyphs: Create GPU bo for large enough destination surfaces with glyphs + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 9580ae8490a4119dac2fefe0085326db350209d7 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 19:11:43 2011 +0000 + + sna: Pass usage-hint to move-to-gpu + + When simply creating a source GPU bo it is preferrable not to mark it as + all-damaged. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 98f15fc61361b7f1e01969f8d4237c13e93e3fb0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 17:25:42 2011 +0000 + + sna: Don't align pwrite to cachelines for doing discontiguous copies + + The batch compaction breaks the 1:1 mapping between the cpu buffer and + the bo, so we can no longer safely align the transfer to whole + cachelines. + + References: https://bugs.freedesktop.org/show_bug.cgi?id=44091 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 3850f4ad48986691e1fb98038ae921deb6c25423 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 12:42:02 2011 +0000 + + sna: Silence unsigned comparison against 0 + + The good news is if this ever failed, the kernel is far too broken... + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit d9ca113a83177562cde3537bf955164c6950cbd0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 10:06:58 2011 +0000 + + sna: Trim the unused pages from the batch between the last command and surface + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 013eda17e91ff421cd1ef70470e3575f1183fcbd +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 10:40:58 2011 +0000 + + sna: Free the additional bindings on proxies + +commit 84d97bdba02b909369b54de21425ffc9f6ad581a +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 23 00:01:50 2011 +0000 + + sna/gen2+: Reuse source channel for mask where possible + + GTK+ has a clever trick for premultiplying its images by loading the + same pixel data into both the source and mask, and then performing the + composite. This causes us to upload the same pixel data twice! + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 281f620573917faef52d9226b12737ce1e2dffdc +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 22:23:41 2011 +0000 + + sna: Age active wholly damaged GPU buffers more slowly + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f8575b8bd150ae11147fbf6b59171cbbb072dfec +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 22:15:42 2011 +0000 + + sna: Cancel the immediate batch submit once handled in the block handler + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 609e1d9da282323ab7abc1baad4d3f24ac55588f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 15:54:39 2011 +0000 + + sna: Bump the inactivity timeout + + With the goal of removing inactive pixmap froms the GPU after 5 minutes + of idleness. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 62602209e54c3568795122ee1c902c3b81985303 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 14:20:20 2011 +0000 + + sna: discard damage-all even for width|height==0 operations + + Even if we don't know the extents of the render operation, if the entire + pixmap is damaged we can still reduce the damage tracking. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f68a99a55e1e63d7e76a13a7b77b4bb3f7802b9e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 15:04:22 2011 +0000 + + sna: Mark fresh GPU only bo as being all damaged + + Presume that we will not fallback and so treat a GPU only bo (one that + is initially created on the GPU) as being all-damaged. This makes future + operations cheaper as the damage tracking overhead is much reduced, and + the cost of the first readback will mainly be in the synchronisation + overhead. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 1f2cd536bc712843233de3f5c50802c388d63c72 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 14:30:04 2011 +0000 + + sna: Reduce damage after complete solid fills + + RenderFillRectangles is often used to initially clear a pixmap after + creation by flooding it with a solid colour, as is PolyRect. We can + reduce further damage operations by checking for this condition. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 7a6a2c5d4cc98da76c73152cb7eafcbdb0c088ec +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 13:24:07 2011 +0000 + + sna: Setup the pixmap correctly in order to attach our private + + During creation of sna_pixmap we validate that we can use a GPU bo with + the target pixmap. This fails if we pass in a raw pixmap header, so + make sure the scratch pixmap is fully initialised first. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f621b3de841f6037d387ca1439a0abe12ef29811 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 11:19:45 2011 +0000 + + sna: flatten source alphamaps + + Replace the source picture+alpha with a bo that contains the RGB + channels from source and A from the alpha map. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6c08eb4d6f8789e692ef018e007d1ae97a57c25f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 22 11:42:39 2011 +0000 + + sna/gen2+: Prefer to use the CPU if we have a source alphamap and CPU pictures + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 354dc3c65b9cb86885b6927ee2b80cd2ee6a82ff +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 21 21:35:06 2011 +0000 + + sna: Avoid fallbacks for convolutions by rendering the convolved texture + + If we have no shader support for generic convolutions, we currently + create the convolved texture using pixman. A multipass accumulation + algorithm can be implemented on top of CompositePicture, so try it! + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 34cfa15e522ba486d591d37f37d494e399f70354 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 21 00:47:47 2011 +0000 + + sna: Drop suggested tiling parameter when creating bo + + The only place where we did anything other than use the default was when + creating a new bo for CopyArea. In that case, basing the choice on the + src GPU bo was not only wrong but a potential segfault. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 4d348425592251f49fd31b9259651e8b05e92d1e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 21:35:58 2011 +0000 + + sna: Intiialise pixmap size before use + + After 0c12f7cb0 we were setting the width/height of the pixmap *after* + trying to use them to determine if the pixmap could be created on the + GPU. Normally this would be corrected when we attempt to render, except + for the core drawing protocol. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e71058c9c81067cd72b1193242acbd85272ab73a +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 21:20:48 2011 +0000 + + sna: Always readback untiled bo in place + + We are going to gain no advantage from the kernel detiling the busy + buffer. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6690ff51ec939367051985172a00bf8ed65ac4e3 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 21:09:01 2011 +0000 + + sna: Treat all exported bo as potentially active + + Don't assume that a read/write will clear the active flag if the bo has + been exported to another DRI client. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 743084bbc4c411694190f60cf5161086ada6454f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 20:42:08 2011 +0000 + + sna: Only upload tiny pixmaps on the second use + + Most small pixmaps appear to be single shot, so amalgamate them into one + buffer and trim our memory usage. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ca24ffe8b9acef034a5610376c73ebbdce87d41c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 20:11:12 2011 +0000 + + sna: Improve a debug message + + Give the units when saying the pixmap is too small to bother tiling. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f837b9bcc7d384aeb37c2e9ebdac95571deaedc6 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 20:06:25 2011 +0000 + + sna/render: If the pixmap already has a GPU bo, use it for the source + + The usage hint not to create a GPU bo is obviously superceded if we + already have a GPU bo. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit dfafe76a57655784c313bc2078d0b28a7ac2675b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 18:39:20 2011 +0000 + + sna: Do not use Y-tiling for composite back pixmaps + + These are treated by the core drawing routines as replacements for the + front-buffer attached to Windows, and so expect the usual BLT + accelerations are available, for example overlapping blits to handle + scrolling. If we create these pixmaps with Y-tiling and then they are + pinned by the external compositor we are forced to perform a double copy + through the 3D pipeline as it does not handle overlapping blits and the + BLT does not handle Y-tiling. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0cda7b4fa82870d57fcd0036a3b734cc73e2bf28 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 17:58:33 2011 +0000 + + sna: Implement extended fallback handling for src == dst copies + + Only marginally better than falling all the way back to using the CPU, + is to perform a double copy to workaround the overlapping copy. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit d257a967396c517146cfb12bbec5cd28418752a3 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 12:53:42 2011 +0000 + + sna: Explicitly handle depth==1 scratch pixmaps + + Short-cut the determination of whether it can be tiled and accelerated + -- we know it can't! This is mainly to cleanup the debug logs. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0c12f7cb01e75de3bf9c2af8ac6d5b4152566457 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 10:19:01 2011 +0000 + + sna: Tidy up some recent valgrind complaints with reuse of scratch pixmaps + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit d3a4f5db149888239b78df1b9fcc5379b1603005 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 12:12:39 2011 +0000 + + sna: Fixup the refcnt to avoid an assert + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ac52a1fcd11a3ab10e1843ed2d19f9cf818de4c1 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 02:20:48 2011 +0000 + + sna: Don't immediately check for region intersection after subtract + + In the READ==0 case we know that the region does not intersect damage + because we have just subtracted, and checking the intersection causes us + to immediately apply the subtraction operation defeating the + optimisation and forcing the expensive operation each time. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 4071dca0ef8b2b1605f16bed5c42991885a35efd +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 20 00:25:29 2011 +0000 + + sna: Don't mark mapping as synchronous by default + + Only those that point into scratch memory need to synchronized before + control is handed back to the client. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 4c2a97e9d2b1073f0e4b3f7b6670939e1b1c5121 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 19 23:10:45 2011 +0000 + + sna: Always pass the damage to sna_drawable_use_gpu_bo() -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rhefb-00062g...@vasks.debian.org