xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog | 486 +++++++++++++++++++++++++++++++++++++++++++
NEWS | 41 +++
configure.ac | 2
debian/changelog | 19 +
src/compat-api.h | 1
src/intel_module.c | 46 ++--
src/sna/gen2_render.c | 4
src/sna/gen3_render.c | 4
src/sna/gen4_render.c | 6
src/sna/gen5_render.c | 6
src/sna/gen6_render.c | 9
src/sna/gen7_render.c | 23 +-
src/sna/kgem.c | 28 +-
src/sna/sna.h | 6
src/sna/sna_accel.c | 192 ++++++++++------
src/sna/sna_cpu.c | 6
src/sna/sna_display.c | 244 +++++++++++++++------
src/sna/sna_display_fake.c | 15 -
src/sna/sna_dri.c | 10
src/sna/sna_driver.c | 23 --
src/sna/sna_glyphs.c | 10
src/sna/sna_render.c | 3
src/sna/sna_render.h | 15 -
src/sna/sna_video.c | 162 +++++++++-----
src/sna/sna_video.h | 44 ++-
src/sna/sna_video_hwmc.c | 64 ++---
src/sna/sna_video_hwmc.h | 2
src/sna/sna_video_overlay.c | 344 +++++++++++++++---------------
src/sna/sna_video_sprite.c | 282 ++++++++++++++----------
src/sna/sna_video_textured.c | 257 +++++++++++-----------
test/Makefile.am | 2
test/tearing.mp4 |binary
32 files changed, 1598 insertions(+), 758 deletions(-)
New commits:
commit bcb08de53f384061c526662496dc06cc4fd9e1a3
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Jun 6 15:13:26 2013 +0200
release to saucy
diff --git a/debian/changelog b/debian/changelog
index c421951..47626dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.21.9-0ubuntu1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.9-0ubuntu1) saucy; urgency=low
* Merge from unreleased debian git, remaining changes:
- Use SNA by default.
* Add support for haswell graphics. (LP: #1175533)
* Fix crash in xserver when using the unity dash. (LP: #118123)
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 23 May 2013 09:44:44 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 06 Jun 2013 15:05:00 +0200
xserver-xorg-video-intel (2:2.21.9-1) UNRELEASED; urgency=low
commit 95929a9bec4f725334d4038a7e1102f97ec73767
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Jun 6 14:55:53 2013 +0200
Merge from unreleased debian git.
* Merge from unreleased debian git, remaining changes:
- Use SNA by default.
diff --git a/debian/changelog b/debian/changelog
index 4624a80..c421951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.21.9-0ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from unreleased debian git, remaining changes:
+ - Use SNA by default.
+ * Add support for haswell graphics. (LP: #1175533)
+ * Fix crash in xserver when using the unity dash. (LP: #118123)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 23 May 2013 09:44:44 +0200
+
xserver-xorg-video-intel (2:2.21.9-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
commit 4ea0a2b45127b2b06b8fe83f167d498cc62748af
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Jun 6 14:53:04 2013 +0200
bump version
diff --git a/ChangeLog b/ChangeLog
index abcd8c4..e61e127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,489 @@
+commit 2770655371954413c750b030c9a7135baee302d4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jun 6 12:04:23 2013 +0100
+
+ 2.21.9 release
+
+commit d3345cd269dc75999b35f3286d21059974dcb24b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jun 6 12:18:32 2013 +0100
+
+ sna: Only emit an error for terminal mmap failures
+
+ If we repeat the mmap, keep quiet. Only emit the ErrorF in case even the
+ repeated attempts to mmap the bo fail.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 70fa080d02bff9742523cea52c875d9447a78bfd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jun 5 23:32:01 2013 +0100
+
+ sna: Include the GT details in the backend name for a chipset
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 45c09bfe58c37bbf7965af25bdd4fa5c37c0908f
+Author: Rodrigo Vivi <rodrigo.vivi@gmail.com>
+Date: Wed Jun 5 13:07:13 2013 -0300
+
+ Add more correct names for Haswell.
+
+ As we find out more of the final product names for Haswell chipsets, we
+ need to update the user visible identification strings.
+
+ Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
+
+commit a9f9fb8e44bb0bdbd004da1fce986585ebcafd28
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jun 5 09:48:19 2013 +0100
+
+ sna/video: Fix redundant initialisation of video->clip
+
+ It will be created before use anyway, but this silences a compiler
+ warning.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5d0ae71f1d667759ed4cfd2b7e793a08b8e3702c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jun 5 09:12:48 2013 +0100
+
+ sna: Do not conflate ignoring an output with an allocation failure
+
+ If the user explicitly ignores an output through xorg.conf, then
+ xf86OutputCreate returns NULL. This is not to be confused with an
+ allocation error that also returns NULL. The latter is terminal, the
+ former is desired.
+
+ Fixes regression from commit a9acc8dbb436e1e523e7d7c0f3c41946a2d0f245
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Thu May 30 12:09:52 2013 +0100
+
+ sna: Cleanup up error reporting after failure to init KMS interface
+
+ Reported-by: David Rosca <nowrep@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65381
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6dacaddb6a28670a52cead4b62c056a8acde8f3a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 3 15:34:37 2013 +0100
+
+ sna: Always populate the CPU features string
+
+ So that we don't print random contents of the stack on ancient 32-bit
+ CPUs with no extended instruction sets.
+
+ References: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1186800
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8a88c01c3737a3570628600b1ab51938f82e226d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 3 14:14:09 2013 +0100
+
+ sna: Make copying the glyph size more compact
+
+ The assembly was ugly with an unwarranted AGU stall.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 66ad4d6f3c990bd40d816b4a22122bbf64786e4c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 2 12:13:46 2013 +0100
+
+ sna/dri: Undo any COW before performing a copy with DRI2CopyRegion
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65250
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9a8ff7861c50b2f8698a968a011d5d833c7d5975
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 2 12:13:28 2013 +0100
+
+ sna: Add some more DBG hints to copy-on-write cloning
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c4ad7b14ca71b95af83864b05793ea357f48bb88
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 1 16:58:15 2013 +0100
+
+ sna: Prevent adding damage to an already all-damaged GPU bo
+
+ Keep the bookkeeping straight after propagating the source clear colour:
+ commit 810a0ce2f89ba6b343b5043963626c0f2d50fb22 [2.21.7]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Fri May 10 12:02:10 2013 +0100
+
+ sna: Propagate clear color when replacing by a CopyArea
+
+ Reported-by: Roman Jarosz <kedgedev@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65247
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit be84b6929705584f30b63d6e613ff3d8e6e3dc1d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 1 16:51:38 2013 +0100
+
+ sna/dri: Reorder assert not to fail on a pageflip deferred to after a modeset
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2e11b520bbdb1af7e977db7fdef2d4c41242d56f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 30 15:34:08 2013 +0100
+
+ sna: Compile fix for non-debug builds
+
+ sna_display.c: In function 'get_fb':
+ sna_display.c:181:3: warning: implicit declaration of function 'assert_scanout' [-Wimplicit-function-declaration]
+ sna_display.c:181:3: warning: nested extern declaration of 'assert_scanout' [-Wnested-externs]
+
+ * sigh
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3a9975729c665cd09a33e33eab608350aaee8160
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 30 14:15:23 2013 +0100
+
+ sna: Restore GPU promotion for large fills
+
+ Fix another regression from
+ commit ef9dc6fae585d5616446eedc1e6e91173f4064c1 [2.21.7]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Mon May 20 11:08:51 2013 +0100
+
+ sna: Undo a few more overwritten operations upon a bo
+
+ The REPLACES predicate was meant to complement the existing tests, not
+ be compulsory.
+
+ Found whilst investigating why performance seemed to have dropped off in
+ Phoronix's benchmarks.
+
+ Reported-by: Michael Larabel <michael@phoronix.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 08b33ba8f12bb4bc425ca1bc40e2660e446e2c65
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 30 14:57:56 2013 +0100
+
+ sna: Assert that an existing scanout is the desired size
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a9acc8dbb436e1e523e7d7c0f3c41946a2d0f245
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 30 12:09:52 2013 +0100
+
+ sna: Cleanup up error reporting after failure to init KMS interface
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f4fcb0e7d24a104afb642dd8819e67ffcaafbfb1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 30 12:02:44 2013 +0100
+
+ sna: Report allocations failures during Screen initialisation
+
+ Just abort instead of trying to limp on if we fail to even allocate
+ memory during initialisation.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7f7c8087db6af58109e791763fe33582a1559646
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed May 29 12:25:37 2013 +0100
+
+ sna: Log which outputs are being configured during a modeset
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fc1e0702b25e647cb423851fb7228989fec28bd6
+Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Wed May 29 11:25:28 2013 +0100
+
+ sna: fixup up possible_clones kms->X impedance mismatch
+
+ We need to be a notch more careful with remapping the possible clones
+ mask from the kernel:
+ - SDVO and Haswell DDI have multiple connectors mapping to the same encoder.
+ - The connector list can be reordered compared to the encoder list.
+ This is used to move eDP/LVDS to the front.
+
+ Also add even more debug output.
+
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit b7aa05e44b1f88284183c1c73bb074dd5dce74cb
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 28 23:01:30 2013 +0100
+
+ sna: Sanity check that CRTC / output combination is valid
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b507796679529b14c99e8937870561cd8eebebb9
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 28 12:13:02 2013 +0100
+
+ Add the known marketing names for the performance Haswell parts
+
+ Start filling in the names for the parts that have been announced, the
+ Iris branded Haswell GT3 parts.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b3169768ddf8c8977d2ace3675611b5ec6eba7ee
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 28 12:02:56 2013 +0100
+
+ sna: Make the backend identifier more informative
+
+ This is useful, for example, with the multiple gen7 variants.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0839e3316a02380cd64d354ee0ec9d4c2b8eecf4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 28 11:18:14 2013 +0100
+
+ sna: Call mode update after disabling outputs upon VT switch
+
+ Perform a second sanity check that all the outputs we expect to be
+ active remain so following the cleanup after VT switching.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7d64f596b895071ea253481c97275bf551c013e9
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon May 27 21:13:40 2013 +0100
+
+ test: Add an easily visible tearing test for video playback
+
+ Contributed by Matti Hamalainen.
+
+commit f38d037b94aacdccb2aaa058bbe48d1c8079d604
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon May 27 21:07:20 2013 +0100
+
+ sna/video: Correct interpretation of 'sync'
+
+ The 'sync' parameter past along XvPutImage is not a request for us to
+ perform the operation synchronised to the vblank, rather a hint that the
+ client wishes the operation to be synchronous. In Xorg, this is
+ implemented as an immediate ShmCompletion event so make sure we flush
+ the operation to hw in this case.
+
+ Fixes regression from
+ commit 195a51353c3af7bd253227da5f759f06cea01f73 [2.21.8]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Tue Apr 9 19:13:46 2013 +0100
+
+ sna/video: Convert to a pure Xv backend
+
+ Reported-by: Matti Hamalainen <ccr@tnsp.org>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65048
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7e7d0ad15bafc4624f8c2ccf73c08ead5cc6fd6a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon May 27 13:41:13 2013 +0100
+
+ 2.21.8 release
+
+commit 51103d8637ba34a0d5f3507e196f54333aa765bb
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat May 25 15:53:11 2013 +0100
+
+ sna: Free the released COW reference when uncloning
+
+ Reported-by: Jiri Slaby <jirislaby@gmail.com>
+ Reported-by: David Gow <david@ingeniumdigital.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64978
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fce4292ab7216a1c610ffc57aa6763e05b458904
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 15:15:13 2013 +0100
+
+ sna: Fix cut'n'paste compile error from previous commit
+
+ Always check for outstanding diff before pushing.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e2e139923dd000f13602e51d94bc8a265b5e234f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 15:08:13 2013 +0100
+
+ sna: Log when the framebuffer changes size
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 820f97ede7a38015a781de72cc265b0b65f86415
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 14:38:06 2013 +0100
+
+ sna: Reorder cleanup of flush list and CPU bo to silence an assertion
+
+ Keep the bookkeeping in order.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 79e98ea6448f666d1a6dcca19bfe0e84fb62dd46
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 13:08:26 2013 +0100
+
+ sna: Reenable COW support
+
+ Accidentally left it disabled whilst testing.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f6c35e58c1bb94ccfa04723db76d7164d5772f11
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 12:43:16 2013 +0100
+
+ sna: Do not undo a bo if we may fallback
+
+ If we undo the pending operations to a bo, then fallback we cause
+ corruption. For example, see wine and its 1-bit rendering.
+
+ Fixes regression from
+ commit 07a4400fffe4f83df3debe62abd2c37b45f8f0c0 [2.21.7]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Fri May 10 11:59:59 2013 +0100
+
+ sna: Attempt to discard overwritten operations before CopyArea
+
+ Also we need to be more careful and consider alu when marking the
+ operation as 'replaces'.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 818702d3dc48964e4fd11afe8f2fce431ae913c0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 12:15:42 2013 +0100
+
+ sna: Discard COW before migrating CPU damage to the GPU
+
+ At that point, the GPU bo will no longer be a clone of the source and so
+ we need to decouple it and make ourselves a fresh copy.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2b9723767612702f4cfa2f73ffced83c46eccddf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 11:46:36 2013 +0100
+
+ sna: Do make a clone of a GPU bo that is itself a cache
+
+ As we do not attempt to undo the cache status upon the clone.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit dbe2b5896ec2cd00a456236467b221c9fafdd2f7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 12:03:41 2013 +0100
+
+ sna: Correct assertion for reusing COW
+
+ Reported-by: Jiri Slaby <jirislaby@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47597
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2005b273e10f2b946f79c602b55a7bf585c936de
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri May 24 11:02:20 2013 +0100
+
+ sna: Check for NULL damage before dereferencing
+
+ Fixes regression from
+ commit 16a64649e9c440ab9457467fe04be25719a73e7c [2.21.7]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Fri May 10 15:48:58 2013 +0100
+
+ sna: Basic copy-on-write support for cloning pixmaps
+
+ Reported-by: Axel Rohde
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ee7ea10148b7843091c3fa103f9f4476979f8b68
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu May 23 12:55:21 2013 +0100
+
+ sna: Only flags the PolyFillRect as REPLACES if it is unclipped
+
+ Otherwise we discard a fill operation that is required to initialise the
+ pixmap before drawing commences.
+
+ Fixes regression from
+ commit ef9dc6fae585d5616446eedc1e6e91173f4064c1 [2.21.7]
+ Author: Chris Wilson <chris@chris-wilson.co.uk>
+ Date: Mon May 20 11:08:51 2013 +0100
+
+ sna: Undo a few more overwritten operations upon a bo
+
+ Reported-by: Matti Hamalainen <ccr@tnsp.org>
+ Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64841
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 87295b1ef85505689ce326137c2794230fb3f35f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed May 22 09:43:16 2013 +0100
+
+ sna: Remove the overzealous assert
+
+ IGNORE_CPU is sometimes only set when there is CPU damage to ignore...
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f2e0454f2df4289521b24de41fb41c68f7abf0ed
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed May 22 08:58:51 2013 +0100
+
+ sna: Fix DBG typo and so fix build with --enable-debug
+
+ s/hint/flags/ -- used the wrong variable name in an assert and upset the
+ compiler.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit abe85adda51c58d3f3b9c5dea6cec4b13a65cdcd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 21 13:39:35 2013 +0100
+
+ sna: Warn about the consequences of disabling tiling
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 195a51353c3af7bd253227da5f759f06cea01f73
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Apr 9 19:13:46 2013 +0100
+
+ sna/video: Convert to a pure Xv backend
+
+ This is to enable feature work which requires access to Client state.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8e42637050275945200797538a34c13c90b295cc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue May 21 11:13:03 2013 +0100
+
+ sna: Re-enable read-read optimisations
+
+ Coacher is optimistic that the issue is no longer reproducible on his
+ machine - and whilst I do not understand the root cause, I am confident
+ that the kernel code is correct as is our use.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=61628
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
commit e65ee10dfd7155230ac18a6d24a67b68336dc973
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue May 21 11:01:50 2013 +0100
diff --git a/debian/changelog b/debian/changelog
index d9e874a..210c2d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.21.7-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.9-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
commit 2770655371954413c750b030c9a7135baee302d4
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jun 6 12:04:23 2013 +0100
2.21.9 release
diff --git a/NEWS b/NEWS
index eb0d9b2..2d358c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+Release 2.21.9 (2013-06-06)
+===========================
+Consolidating the copy-on-write support, hopefully cleaning up the last of
+the regressions.
+
+ * Restore vsync on textured videos.
+ [regression from 2.21.8]
+ https://bugs.freedesktop.org/show_bug.cgi?id=65048
+
+ * Fix incorrect ordering of possible_clones with certain outputs, which
+ can lead to attempting to incorrectly clone 2 outputs and failing to
+ light them up.
+ [regression from 2.20.10]
+
+ * Fix performance regression from not promoting large fills to the GPU
+ [regression from 2.21.7]
+
+ * Undo the pixmap clone before performing a DRI2CopyRegion
+ [regression from 2.21.7]
+ https://bugs.freedesktop.org/show_bug.cgi?id=65250
+
+
Release 2.21.8 (2013-05-27)
===========================
A quick release to cleanup a few regressions from the introduction of
diff --git a/configure.ac b/configure.ac
index 0bac6f6..3f6f9bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-intel],
- [2.21.8],
+ [2.21.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
commit d3345cd269dc75999b35f3286d21059974dcb24b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jun 6 12:18:32 2013 +0100
sna: Only emit an error for terminal mmap failures
If we repeat the mmap, keep quiet. Only emit the ErrorF in case even the
repeated attempts to mmap the bo fail.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 62713de..fefaa8b 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -292,8 +292,8 @@ retry_gtt:
VG_CLEAR(mmap_arg);
mmap_arg.handle = bo->handle;
if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg)) {
- ErrorF("%s: failed to retrieve GTT offset for handle=%d: %d\n",
- __FUNCTION__, bo->handle, errno);
+ int err = errno;
+
(void)__kgem_throttle_retire(kgem, 0);
if (kgem_expire_cache(kgem))
goto retry_gtt;
@@ -303,6 +303,8 @@ retry_gtt:
goto retry_gtt;
}
+ ErrorF("%s: failed to retrieve GTT offset for handle=%d: %d\n",
+ __FUNCTION__, bo->handle, err);
return NULL;
}
@@ -310,8 +312,8 @@ retry_mmap:
ptr = mmap(0, bytes(bo), PROT_READ | PROT_WRITE, MAP_SHARED,
kgem->fd, mmap_arg.offset);
if (ptr == MAP_FAILED) {
- ErrorF("%s: failed to mmap %d, %d bytes, into GTT domain: %d\n",
- __FUNCTION__, bo->handle, bytes(bo), errno);
+ int err = errno;
+
if (__kgem_throttle_retire(kgem, 0))
goto retry_mmap;
@@ -320,6 +322,8 @@ retry_mmap:
goto retry_mmap;
}
+ ErrorF("%s: failed to mmap handle=%d, %d bytes, into GTT domain: %d\n",
+ __FUNCTION__, bo->handle, bytes(bo), err);
ptr = NULL;
}
@@ -4694,8 +4698,8 @@ retry:
mmap_arg.offset = 0;
mmap_arg.size = bytes(bo);
if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) {
- ErrorF("%s: failed to mmap %d, %d bytes, into CPU domain: %d\n",
- __FUNCTION__, bo->handle, bytes(bo), errno);
+ int err = errno;
+
if (__kgem_throttle_retire(kgem, 0))
goto retry;
@@ -4704,6 +4708,8 @@ retry:
goto retry;
}
+ ErrorF("%s: failed to mmap handle=%d, %d bytes, into CPU domain: %d\n",
+ __FUNCTION__, bo->handle, bytes(bo), err);
return NULL;
}
@@ -4734,8 +4740,8 @@ retry:
mmap_arg.offset = 0;
mmap_arg.size = bytes(bo);
if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg)) {
- ErrorF("%s: failed to mmap %d, %d bytes, into CPU domain: %d\n",
- __FUNCTION__, bo->handle, bytes(bo), errno);
+ int err = errno;
+
if (__kgem_throttle_retire(kgem, 0))
goto retry;
@@ -4744,6 +4750,8 @@ retry:
goto retry;
}
+ ErrorF("%s: failed to mmap handle=%d, %d bytes, into CPU domain: %d\n",
+ __FUNCTION__, bo->handle, bytes(bo), err);
return NULL;
}
commit 70fa080d02bff9742523cea52c875d9447a78bfd
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Jun 5 23:32:01 2013 +0100
sna: Include the GT details in the backend name for a chipset
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index c25ef94..187cc15 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -68,6 +68,7 @@
#define GEN6_MAX_SIZE 8192
struct gt_info {
+ const char *name;
int max_vs_threads;
int max_gs_threads;
int max_wm_threads;
@@ -79,6 +80,7 @@ struct gt_info {
};
static const struct gt_info gt1_info = {
+ .name = "Sandybridge (gen6, gt1)",
.max_vs_threads = 24,
.max_gs_threads = 21,
.max_wm_threads = 40,
@@ -86,6 +88,7 @@ static const struct gt_info gt1_info = {
};
static const struct gt_info gt2_info = {
+ .name = "Sandybridge (gen6, gt2)",
.max_vs_threads = 60,
.max_gs_threads = 60,
.max_wm_threads = 80,
@@ -3704,5 +3707,5 @@ const char *gen6_render_init(struct sna *sna, const char *backend)
sna->render.max_3d_size = GEN6_MAX_SIZE;
sna->render.max_3d_pitch = 1 << 18;
- return "Sandybridge (gen6)";
+ return sna->render_state.gen6.info->name;
}
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 6dbf1d2..3e3da48 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -75,6 +75,7 @@
#define is_aligned(x, y) (((x) & ((y) - 1)) == 0)
struct gt_info {
+ const char *name;
uint32_t max_vs_threads;
uint32_t max_gs_threads;
uint32_t max_wm_threads;
@@ -86,6 +87,7 @@ struct gt_info {
};
static const struct gt_info ivb_gt_info = {
+ .name = "Ivybridge (gen7)",
.max_vs_threads = 16,
.max_gs_threads = 16,
.max_wm_threads = (16-1) << IVB_PS_MAX_THREADS_SHIFT,
@@ -93,6 +95,7 @@ static const struct gt_info ivb_gt_info = {
};
static const struct gt_info ivb_gt1_info = {
+ .name = "Ivybridge (gen7, gt1)",
.max_vs_threads = 36,
.max_gs_threads = 36,
.max_wm_threads = (48-1) << IVB_PS_MAX_THREADS_SHIFT,
@@ -100,13 +103,23 @@ static const struct gt_info ivb_gt1_info = {
};
static const struct gt_info ivb_gt2_info = {
+ .name = "Ivybridge (gen7, gt2)",
.max_vs_threads = 128,
.max_gs_threads = 128,
.max_wm_threads = (172-1) << IVB_PS_MAX_THREADS_SHIFT,
.urb = { 256, 704, 320 },
};
+static const struct gt_info vlv_gt_info = {
+ .name = "Valleyview (gen7)",
+ .max_vs_threads = 16,
+ .max_gs_threads = 16,
+ .max_wm_threads = (16-1) << IVB_PS_MAX_THREADS_SHIFT,
+ .urb = { 128, 64, 64 },
+};
+
static const struct gt_info hsw_gt_info = {
+ .name = "Haswell (gen7.5)",
.max_vs_threads = 8,
.max_gs_threads = 8,
.max_wm_threads =
@@ -116,6 +129,7 @@ static const struct gt_info hsw_gt_info = {
};
static const struct gt_info hsw_gt1_info = {
+ .name = "Haswell (gen7.5, gt1)",
.max_vs_threads = 70,
.max_gs_threads = 70,
.max_wm_threads =
@@ -125,6 +139,7 @@ static const struct gt_info hsw_gt1_info = {
};
static const struct gt_info hsw_gt2_info = {
+ .name = "Haswell (gen7.5, gt2)",
.max_vs_threads = 140,
.max_gs_threads = 140,
.max_wm_threads =
@@ -3718,13 +3733,12 @@ static bool is_mobile(struct sna *sna)
return (DEVICE_ID(sna->PciInfo) & 0xf) == 0x6;
}
-static const char *gen7_render_setup(struct sna *sna)
+static bool gen7_render_setup(struct sna *sna)
{
struct gen7_render_state *state = &sna->render_state.gen7;
struct sna_static_stream general;
struct gen7_sampler_state *ss;
int i, j, k, l, m;
- const char *backend;
if (sna->kgem.gen == 070) {
state->info = &ivb_gt_info;
@@ -3733,10 +3747,8 @@ static const char *gen7_render_setup(struct sna *sna)
if (is_gt2(sna))
state->info = &ivb_gt2_info; /* XXX requires GT_MODE WiZ disabled */
}
- backend = "Ivybridge (gen7)";
} else if (sna->kgem.gen == 071) {
- state->info = &ivb_gt_info;
- backend = "Valleyview (gen7)";
+ state->info = &vlv_gt_info;
} else if (sna->kgem.gen == 075) {
state->info = &hsw_gt_info;
if (DEVICE_ID(sna->PciInfo) & 0xf) {
@@ -3744,9 +3756,8 @@ static const char *gen7_render_setup(struct sna *sna)
if (is_gt2(sna))
state->info = &hsw_gt2_info;
}
- backend = "Haswell (gen7.5)";
} else
- return NULL;
+ return false;
sna_static_stream_init(&general);
@@ -3807,16 +3818,13 @@ static const char *gen7_render_setup(struct sna *sna)
state->cc_blend = gen7_composite_create_blend_state(&general);
state->general_bo = sna_static_stream_fini(sna, &general);
- return state->general_bo ? backend : NULL;
+ return state->general_bo != NULL;
}
-const char *gen7_render_init(struct sna *sna, const char *parent)
+const char *gen7_render_init(struct sna *sna, const char *backend)
{
- const char *backend;
-
- backend = gen7_render_setup(sna);
- if (backend == NULL)
- return parent;
+ if (!gen7_render_setup(sna))
+ return backend;
sna->kgem.context_switch = gen7_render_context_switch;
sna->kgem.retire = gen7_render_retire;
@@ -3860,5 +3868,5 @@ const char *gen7_render_init(struct sna *sna, const char *parent)
sna->render.max_3d_size = GEN7_MAX_SIZE;
sna->render.max_3d_pitch = 1 << 18;
- return backend;
+ return sna->render_state.gen7.info->name;
}
commit 45c09bfe58c37bbf7965af25bdd4fa5c37c0908f
Author: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Date: Wed Jun 5 13:07:13 2013 -0300
Add more correct names for Haswell.
As we find out more of the final product names for Haswell chipsets, we
need to update the user visible identification strings.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
diff --git a/src/intel_module.c b/src/intel_module.c
index 8b3b196..c1d0e09 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -160,19 +160,19 @@ static const SymTabRec intel_chipsets[] = {
{PCI_CHIP_IVYBRIDGE_D_GT2, "Ivybridge Desktop (GT2)" },
{PCI_CHIP_IVYBRIDGE_S_GT1, "Ivybridge Server" },
{PCI_CHIP_IVYBRIDGE_S_GT2, "Ivybridge Server (GT2)" },
- {PCI_CHIP_HASWELL_D_GT1, "Haswell Desktop (GT1)" },
- {PCI_CHIP_HASWELL_D_GT2, "Haswell Desktop (GT2)" },
+ {PCI_CHIP_HASWELL_D_GT1, "HD Graphics" },
+ {PCI_CHIP_HASWELL_D_GT2, "HD Graphics 4600" },
{PCI_CHIP_HASWELL_D_GT3, "Haswell Desktop (GT3)" },
- {PCI_CHIP_HASWELL_M_GT1, "Haswell Mobile (GT1)" },
- {PCI_CHIP_HASWELL_M_GT2, "Haswell Mobile (GT2)" },
+ {PCI_CHIP_HASWELL_M_GT1, "HD Graphics" },
+ {PCI_CHIP_HASWELL_M_GT2, "HD Graphics 4600" },
{PCI_CHIP_HASWELL_M_GT3, "Haswell Mobile (GT3)" },
- {PCI_CHIP_HASWELL_S_GT1, "Haswell Server (GT1)" },
- {PCI_CHIP_HASWELL_S_GT2, "Haswell Server (GT2)" },
+ {PCI_CHIP_HASWELL_S_GT1, "HD Graphics" },
+ {PCI_CHIP_HASWELL_S_GT2, "HD Graphics P4600/P4700" },
{PCI_CHIP_HASWELL_S_GT3, "Haswell Server (GT3)" },
{PCI_CHIP_HASWELL_B_GT1, "Haswell (GT1)" },
{PCI_CHIP_HASWELL_B_GT2, "Haswell (GT2)" },
{PCI_CHIP_HASWELL_B_GT3, "Haswell (GT3)" },
- {PCI_CHIP_HASWELL_E_GT1, "Haswell (GT1)" },
+ {PCI_CHIP_HASWELL_E_GT1, "HD Graphics" },
{PCI_CHIP_HASWELL_E_GT2, "Haswell (GT2)" },
{PCI_CHIP_HASWELL_E_GT3, "Haswell (GT3)" },
{PCI_CHIP_HASWELL_SDV_D_GT1, "Haswell SDV Desktop (GT1)" },
@@ -193,23 +193,23 @@ static const SymTabRec intel_chipsets[] = {
{PCI_CHIP_HASWELL_ULT_D_GT1, "Haswell ULT Desktop (GT1)" },
{PCI_CHIP_HASWELL_ULT_D_GT2, "Haswell ULT Desktop (GT2)" },
{PCI_CHIP_HASWELL_ULT_D_GT3, "Iris(TM) Graphics 5100" },
- {PCI_CHIP_HASWELL_ULT_M_GT1, "Haswell ULT Mobile (GT1)" },
- {PCI_CHIP_HASWELL_ULT_M_GT2, "Haswell ULT Mobile (GT2)" },
- {PCI_CHIP_HASWELL_ULT_M_GT3, "Iris(TM) Graphics 5100" },
+ {PCI_CHIP_HASWELL_ULT_M_GT1, "HD Graphics" },
+ {PCI_CHIP_HASWELL_ULT_M_GT2, "HD Graphics 4400" },
+ {PCI_CHIP_HASWELL_ULT_M_GT3, "HD Graphics 5000" },
{PCI_CHIP_HASWELL_ULT_S_GT1, "Haswell ULT Server (GT1)" },
{PCI_CHIP_HASWELL_ULT_S_GT2, "Haswell ULT Server (GT2)" },
{PCI_CHIP_HASWELL_ULT_S_GT3, "Iris(TM) Graphics 5100" },
{PCI_CHIP_HASWELL_ULT_B_GT1, "Haswell ULT (GT1)" },
{PCI_CHIP_HASWELL_ULT_B_GT2, "Haswell ULT (GT2)" },
{PCI_CHIP_HASWELL_ULT_B_GT3, "Iris(TM) Graphics 5100" },
- {PCI_CHIP_HASWELL_ULT_E_GT1, "Haswell ULT (GT1)" },
- {PCI_CHIP_HASWELL_ULT_E_GT2, "Haswell ULT (GT2)" },
+ {PCI_CHIP_HASWELL_ULT_E_GT1, "HD Graphics" },
+ {PCI_CHIP_HASWELL_ULT_E_GT2, "HD Graphics 4200" },
{PCI_CHIP_HASWELL_ULT_E_GT3, "Iris(TM) Graphics 5100" },
{PCI_CHIP_HASWELL_CRW_D_GT1, "Haswell CRW Desktop (GT1)" },
- {PCI_CHIP_HASWELL_CRW_D_GT2, "Haswell CRW Desktop (GT2)" },
+ {PCI_CHIP_HASWELL_CRW_D_GT2, "HD Graphics 4600" },
{PCI_CHIP_HASWELL_CRW_D_GT3, "Iris(TM) Pro Graphics 5200" },
{PCI_CHIP_HASWELL_CRW_M_GT1, "Haswell CRW Mobile (GT1)" },
- {PCI_CHIP_HASWELL_CRW_M_GT2, "Haswell CRW Mobile (GT2)" },
+ {PCI_CHIP_HASWELL_CRW_M_GT2, "HD Graphics 4600" },
{PCI_CHIP_HASWELL_CRW_M_GT3, "Iris(TM) Pro Graphics 5200" },
{PCI_CHIP_HASWELL_CRW_S_GT1, "Haswell CRW Server (GT1)" },
{PCI_CHIP_HASWELL_CRW_S_GT2, "Haswell CRW Server (GT2)" },
commit a9f9fb8e44bb0bdbd004da1fce986585ebcafd28
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Jun 5 09:48:19 2013 +0100
Reply to: