xserver-xorg-video-intel: Changes to 'debian-experimental'
Rebased ref, commits from common ancestor:
commit f9b051477067166aa9db6cdf64e7cc6d8a6a832a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Mar 4 01:07:56 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 7f9c37e..b134db1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.14.901-1+exp1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.14.901-1+exp1) experimental; urgency=low
* Rebuild against Xserver 1.10 rc2.
- -- Cyril Brulebois <kibi@debian.org> Sun, 20 Feb 2011 12:34:18 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 04 Mar 2011 01:07:43 +0100
xserver-xorg-video-intel (2:2.14.901-1) UNRELEASED; urgency=low
commit e031fe3ee0bf874cc24e5737771374a5a82883a0
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 2 19:47:24 2011 +0100
Rebuild against Xserver 1.10 rc2.
Do not fake an upload of 2:2.14.901-1 to unstable, this one will happen
once xorg-server 1.9.x reaches testing. So keep both last entries as
UNRELEASED.
diff --git a/debian/changelog b/debian/changelog
index 4aa3720..7f9c37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.14.901-1+exp1) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 20 Feb 2011 12:34:18 +0100
+
xserver-xorg-video-intel (2:2.14.901-1) UNRELEASED; urgency=low
* New upstream snapshot (2.15 rc1).
diff --git a/debian/control b/debian/control
index ead90dd..bba98f1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.9.99.902),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
commit dcf256bc8c39aa4dff6961ae1dc842e10636ac72
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 2 19:41:42 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 25ca9e5..5f33e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,382 @@
+commit 34f9a3335f96b16ef9df6213eb0a586c94f8f05b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Mar 2 17:46:19 2011 +0000
+
+ configure: Bump for 2.14.901 snapshot
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 057783937d7a42a766d0e45174c4c2dc0ffacd40
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Mar 2 17:45:43 2011 +0000
+
+ NEWS: Add entry for 2.14.901 snapshot
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit e889d3a709b55a0731ab098b17a3364b9bf39387
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Feb 27 10:51:50 2011 +0000
+
+ dri: Protect against destroying a foreign DRI drawable
+
+ I have no clue as to how such an alien drawable reached us, but we have
+ the evidence of a segfault to say it can happen.
+
+ Reported-by: Bernie Innocenti <bernie@codewiz.org>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34787
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d21d781466785c317131a8a57606925867265dc8
+Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Tue Feb 22 18:31:44 2011 +0100
+
+ Fix relaxed tiling on gen2
+
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 9599fde65a0d8b7e7c85199346f7b620bdd8388d
+Author: Bryce Harrington <bryce@canonical.com>
+Date: Tue Feb 15 22:30:18 2011 -0800
+
+ Quell excessively verbose vblank counter failed error messages
+
+ Certain error situations can result in the following printed to
+ Xorg.0.log at a high enough rate to make log file size a problem.
+
+ (WW) intel(0): I830DRI2GetMSC:1062 get vblank counter failed: Invalid argument
+ (WW) intel(0): I830DRI2ScheduleWaitMSC:1118 get vblank counter failed: Invalid argument
+
+ Following in the tradition of commit 0ad6d6e1, limit the warnings to be
+ output 5 times, then quell the remainder.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34322
+ Ref.: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/710594
+
+ Signed-off-by: Bryce Harrington <bryce@canonical.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 0ca595e9d533019b241666d29b421c7b36f9647a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Feb 17 15:26:35 2011 -0500
+
+ Fix IGD and IGDNG constants to be comprehensible
+
+ Since, with GPU-on-package, it's hard to talk about a model number for
+ a specific chipset like 855GM, just use the platform names.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4c66b28870b050493ad96f7b0fe2d70d7ee539c7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Feb 17 16:48:24 2011 +0000
+
+ uxa: Fallback if the temporary is too large
+
+ If the render operation requires a temporary source Picture and the
+ operation is large, larger than the maximum permitted bo, then we will
+ fail to allocate the bo. In this case, we need to fallback and perform
+ the operation on the CPU rather than dereference a NULL bo.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34399
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 23f9b14df7c102c1036134835dd5d1a508059858
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Feb 12 10:42:34 2011 +0000
+
+ i965: Remove broken maximum base addresses from video
+
+ WRONG.
+
+ The hardware was never limited to 0x1000000 and the kernel can quite
+ rightly place objects above that limit. Specifying such had no relation
+ to reality, so why did we do it? TWICE!
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34017
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9184af921bc2f332fcb6c9b47001414378eab8e2
+Author: Javier Jardón <jjardon@gnome.org>
+Date: Wed Feb 9 00:36:37 2011 +0000
+
+ Update autotools configuration
+
+ Use new libtool syntax and silent-rules to silent
+ the build output a bit (linux-like)
+
+commit 6e721e098b9181e8e77e314f966729d28e705582
+Author: Bryce Harrington <bryce@canonical.com>
+Date: Fri Feb 4 00:15:13 2011 -0800
+
+ Check return value of uxa_acquire_solid() since it can return NULL
+
+ uxa_acquire_solid returns NULL under OOM. Thus the value of solid
+ must be checked before dereferencing it in the uxa_get_offscreen()
+ call.
+
+ Signed-off-by: Bryce Harrington <bryce@canonical.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit da990536eca09c6de74627541cd56ecfad925eda
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Feb 3 09:41:48 2011 +0000
+
+ uxa: Undo damage translation before appending
+
+ The region is used to paint onto the backing pixmap (and thus
+ translated) prior to being passed to the damage layer (wrt to the
+ drawable). So the local translation needs to be undone first.
+
+ Identified by Christopher James Halse Rogers.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33650
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ce1e0969058f8c70b624bc85bb8d6698a35794d3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jan 31 20:27:26 2011 +0000
+
+ Rename 'intel' backlight to match upstream name in 2.6.38
+
+ (Just waiting for libbacklight to bring sanity...)
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 80f59c8a4f51ccc27653a2de2dee2563b1e911f1
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Jan 31 06:22:39 2011 +0100
+
+ xvmc: Stop using uninitialized variable.
+
+ The actual code was removed in 5f64122551, where the get_surface_status
+ driver callback was dropped. Just return Success if there were no issues
+ with the parameter.
+
+ Get rid of the following with CFLAGS="-Wall -Werror":
+ | CC intel_xvmc.lo
+ | cc1: warnings being treated as errors
+ | intel_xvmc.c: In function ‘XvMCSyncSurface’:
+ | intel_xvmc.c:677: error: ‘ret’ may be used uninitialized in this function
+ | intel_xvmc.c:672: note: ‘ret’ was declared here
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 86284abafbe1364f82509d2656c82ba11cdce6cc
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Jan 31 06:22:38 2011 +0100
+
+ xvmc: Silence gcc, adding a cast to work around signedness issues.
+
+ Both exported XvMCPutSlice/XvMCPutSlice2 functions have a prototype with a
+ parameter whose signedness differs from the one in the put_slice/put_slice2
+ functions they call. Make it unsigned through a cast.
+
+ Get rid of this accordingly with CFLAGS="-Wall -Werror":
+ | CC intel_xvmc.lo
+ | cc1: warnings being treated as errors
+ | intel_xvmc.c: In function ‘XvMCSyncSurface’:
+ | intel_xvmc.c:677: error: ‘ret’ may be used uninitialized in this function
+ | intel_xvmc.c:672: note: ‘ret’ was declared here
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit fc2eb64d7a184770ccd708a5b2337a538ca2b9db
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Jan 31 09:59:04 2011 +0000
+
+ xvmc: Silence gcc, add parentheses around arithmetic.
+
+ Get rid of those accordingly with CFLAGS="-Wall -Werror":
+ | CC i915_xvmc.lo
+ | cc1: warnings being treated as errors
+ | i915_xvmc.c: In function ‘i915_mc_one_time_state_emit’:
+ | i915_xvmc.c:369: error: suggest parentheses around arithmetic in operand of ‘|’
+ | i915_xvmc.c:374: error: suggest parentheses around arithmetic in operand of ‘|’
+ | i915_xvmc.c:379: error: suggest parentheses around arithmetic in operand of ‘|’
+ | i915_xvmc.c: In function ‘i915_mc_load_indirect_render_emit’:
+ | i915_xvmc.c:708: error: suggest parentheses around arithmetic in operand of ‘|’
+ | i915_xvmc.c:713: error: suggest parentheses around arithmetic in operand of ‘|’
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1b9349bceb9172d9bf01638b2df10b9b79e883b4
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Jan 31 06:22:36 2011 +0100
+
+ xvmc: Silence gcc, add parentheses around assignment.
+
+ Get rid of the following with CFLAGS="-Wall -Werror":
+ | CC intel_xvmc_dump.lo
+ | cc1: warnings being treated as errors
+ | intel_xvmc_dump.c: In function ‘intel_xvmc_dump_open’:
+ | intel_xvmc_dump.c:41: error: suggest parentheses around assignment used as truth value
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit ae8877e30707cae586565b4deee4c7fd9ac7d3ed
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Mon Jan 31 06:22:35 2011 +0100
+
+ xvmc: Get rid of unused variables.
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8bd6a7149fcb5f9ed6580dc2aa0180874938a1ea
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jan 29 12:04:09 2011 +0000
+
+ Enable conditional compilation of asserts
+
+ With '--disable-debug' we define NDEBUG and so disable the asserts, that
+ is we continue to default to compiling asserts into the code.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a5a1ab7bbc58ec884cd0b90fe7139f402291b92f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jan 28 17:20:06 2011 +0000
+
+ i915: Remove unused 'w' and 'h'
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2c9b3225d8c7b53e2d921705dbb069710abcea5d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jan 28 17:19:39 2011 +0000
+
+ i915: Remove unused 'num_floats' variable
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit c6dc27562abbc8ca9e873ad502ca49ae010461d2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jan 24 20:25:27 2011 +0000
+
+ uxa: Only recreate the glyph cache on *generational* updates
+
+ The screen resources are recreated when the screen is rotated as well,
+ without being finalized. In this case, we do not need to reconstuct the
+ cache (or if we did, we would need to tear it down first).
+
+ Reported-by: Till Matthiesen <entropy@everymail.net>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33412
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5baa63c634990810a66c3150b4f2b76fcee2df38
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Fri Jan 21 08:45:52 2011 +0800
+
+ Fix an error in 4c4ad555564a80311df1a4b762eb1e119c6d95fb.
+
+ See the original patch at https://bugs.freedesktop.org/show_bug.cgi?id=24767
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 3e28a0c0b43823d3104fe8fc50b5994b41fc0cc1
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jan 20 15:07:26 2011 +0000
+
+ Create the UXA generational resources during screen create
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4c4ad555564a80311df1a4b762eb1e119c6d95fb
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Jan 19 15:25:06 2011 +0000
+
+ Correct offset of planes within clipped window
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24767
+ Reported-and-tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5a22bc999de8555f26c639eaffbe73b680746174
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Jan 17 11:32:37 2011 -0800
+
+ Quiet compiler warning about is_affine_src same way we do is_affine_mask.
+
+commit 3a2a4b0784f0fc96a5457b18931471f15ad745fc
+Author: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
+Date: Mon Jan 17 17:38:23 2011 +0000
+
+ Fix textured video when destination is larger than screen
+
+ In our application, the screen is never rotated from the point of view
+ of the driver; instead, the compositor applies a suitable rotation as
+ it composites the display. This works fine on 945, but on 965, videos
+ are limited in height to the actual height of the screen.
+
+ Change various bits of code so that we use the width and height of the
+ destination pixmap instead of the width and height of the virtual
+ screen. This works correctly both for XVideo to offscreen storage
+ (CompositeRedirect) and for XVideo to the screen (no compositor).
+
+commit fd9235ebe03a01982238cdd6e8b55f613e14b6af
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:58:36 2010 +0000
+
+ Delete unused memory allocation flags.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 03248a798409ca4dd1caf5e25a3d5f5a80173260
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:57:01 2010 +0000
+
+ Cache the fixed crtc<->pipe relationship
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 00a2aee38dc5cbbd4907a593fa8d617f5a20292e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:50:33 2010 +0000
+
+ Remove unused I830Output
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit a851879695c48e88d421b053a78f867d9902273f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:48:26 2010 +0000
+
+ Remove bitrotted, but fortunately unused, I830CrtcPrivate
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f8a5d7737e014e99943b947d088a4f9f1b465d46
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:37:47 2010 +0000
+
+ Delete some dead code
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 968151898b807b06953b2f4170ac02889f16c8dc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:18:25 2010 +0000
+
+ Remove unused GTT/Map sizes and addresses
+
+ These have been made obsolete by KMS and GEM.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 19b5817a54d4a17161340ada9bf20027644ff074
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Dec 17 00:15:31 2010 +0000
+
+ Remove unused struct _intel_memory definition
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
commit 40a7bde9140c0ae6412b8f916b1455d44e2af6cf
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jan 7 23:46:07 2011 +0000
diff --git a/debian/changelog b/debian/changelog
index 52e5855..4aa3720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.14.901-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot (2.15 rc1).
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 02 Mar 2011 19:40:58 +0100
+
xserver-xorg-video-intel (2:2.14.0-4) unstable; urgency=low
* Cherry-pick from upstream:
commit 425b14d47306f472b78ef48e16585882bafb5b62
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Mar 2 19:36:00 2011 +0100
Revert "uxa: Fallback if the temporary is too large"
This reverts commit 4f08ede8515023f64b907e4a9013008fb1a5815b.
Without this revert, merging from upstream leads to some conflict. Pick
the easy road, and revert the cherry-pick before merging.
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 6bffa4d..02bfa03 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -460,12 +460,12 @@ uxa_try_driver_solid_fill(PicturePtr pSrc,
}
static PicturePtr
-uxa_picture_for_pixman_format(ScreenPtr screen,
+uxa_picture_for_pixman_format(ScreenPtr pScreen,
pixman_format_code_t format,
int width, int height)
{
- PicturePtr picture;
- PixmapPtr pixmap;
+ PicturePtr pPicture;
+ PixmapPtr pPixmap;
int error;
if (format == PIXMAN_a1)
@@ -475,29 +475,24 @@ uxa_picture_for_pixman_format(ScreenPtr screen,
if (PIXMAN_FORMAT_A(format) == 0)
format = PIXMAN_a8r8g8b8;
- pixmap = screen->CreatePixmap(screen, width, height,
- PIXMAN_FORMAT_DEPTH(format),
- UXA_CREATE_PIXMAP_FOR_MAP);
- if (!pixmap)
- return 0;
-
- if (!uxa_pixmap_is_offscreen(pixmap)) {
- screen->DestroyPixmap(pixmap);
+ pPixmap = (*pScreen->CreatePixmap)(pScreen, width, height,
+ PIXMAN_FORMAT_DEPTH(format),
+ UXA_CREATE_PIXMAP_FOR_MAP);
+ if (!pPixmap)
return 0;
- }
- picture = CreatePicture(0, &pixmap->drawable,
- PictureMatchFormat(screen,
- PIXMAN_FORMAT_DEPTH(format),
- format),
- 0, 0, serverClient, &error);
- screen->DestroyPixmap(pixmap);
- if (!picture)
+ pPicture = CreatePicture(0, &pPixmap->drawable,
+ PictureMatchFormat(pScreen,
+ PIXMAN_FORMAT_DEPTH(format),
+ format),
+ 0, 0, serverClient, &error);
+ (*pScreen->DestroyPixmap) (pPixmap);
+ if (!pPicture)
return 0;
- ValidatePicture(picture);
+ ValidatePicture(pPicture);
- return picture;
+ return pPicture;
}
static PicturePtr
commit 34f9a3335f96b16ef9df6213eb0a586c94f8f05b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Mar 2 17:46:19 2011 +0000
configure: Bump for 2.14.901 snapshot
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index 5a1baac..e837738 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.63])
AC_INIT([xf86-video-intel],
- [2.14.0],
+ [2.14.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-intel])
AC_CONFIG_SRCDIR([Makefile.am])
commit 057783937d7a42a766d0e45174c4c2dc0ffacd40
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Mar 2 17:45:43 2011 +0000
NEWS: Add entry for 2.14.901 snapshot
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/NEWS b/NEWS
index 4a98c0b..c897bfd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+Snapshot 2.14.901 (2011-03-02)
+==============================
+This is the first release candidate in preparation for the upcoming
+2.15.0 release. We will appreciate any feedback we can get from
+testing of this snapshot.
+
+Still no further along my grandiose plans to improve Render performance,
+aside from the performance tuning lower in the stack, instead we have had
+a steady stream of bug fixes.
+
+Bugs fixed in this snapshot (compared to 2.14.0)
+------------------------------------------------
+
+* Green pixels within partially off-screen video playback
+ https://bugs.freedesktop.org/show_bug.cgi?id=24767
+
+* Defer creation of the glyph cache to generation startup
+ https://bugs.freedesktop.org/show_bug.cgi?id=33412
+
+* Incorrect maximum addresses for video decoder state
+ https://bugs.freedesktop.org/show_bug.cgi?id=34017
+
+* Failure to handle oversized temporary surfaces
+ https://bugs.freedesktop.org/show_bug.cgi?id=34399
+
+* Relaxed tiling corruption on gen2
+
+* Crash when destroying a foreign DRI drawable
+ https://bugs.freedesktop.org/show_bug.cgi?id=34787
+
+
Release 2.14.0 (2011-01-07)
===========================
We are pleased to announce this major release of the xf86-video-intel
commit e889d3a709b55a0731ab098b17a3364b9bf39387
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 27 10:51:50 2011 +0000
dri: Protect against destroying a foreign DRI drawable
I have no clue as to how such an alien drawable reached us, but we have
the evidence of a segfault to say it can happen.
Reported-by: Bernie Innocenti <bernie@codewiz.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34787
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/intel_dri.c b/src/intel_dri.c
index 65c8f39..88d49bd 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -383,17 +383,17 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer)
{
- if (buffer) {
+ if (buffer && buffer->driverPrivate) {
I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
if (--private->refcnt == 0) {
ScreenPtr screen = private->pixmap->drawable.pScreen;
-
screen->DestroyPixmap(private->pixmap);
free(private);
free(buffer);
}
- }
+ } else
+ free(buffer);
}
#endif
commit d21d781466785c317131a8a57606925867265dc8
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue Feb 22 18:31:44 2011 +0100
Fix relaxed tiling on gen2
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index 9341b91..754bb4e 100644
--- a/src/intel_uxa.c
+++ b/src/intel_uxa.c
@@ -195,12 +195,16 @@ intel_uxa_pixmap_compute_size(PixmapPtr pixmap,
*tiling = I915_TILING_NONE;
if (*tiling != I915_TILING_NONE) {
- int aligned_h;
+ int aligned_h, tile_height;
if (*tiling == I915_TILING_X)
- aligned_h = ALIGN(h, 8);
+ tile_height = 8;
else
- aligned_h = ALIGN(h, 32);
+ tile_height = 32;
+ /* i8xx has a 2-row interleaved tile layout */
+ if (IS_GEN2(intel))
+ tile_height *= 2;
+ aligned_h = ALIGN(h, tile_height);
*stride = intel_get_fence_pitch(intel,
ALIGN(pitch, 512),
commit 9599fde65a0d8b7e7c85199346f7b620bdd8388d
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Feb 15 22:30:18 2011 -0800
Quell excessively verbose vblank counter failed error messages
Certain error situations can result in the following printed to
Xorg.0.log at a high enough rate to make log file size a problem.
(WW) intel(0): I830DRI2GetMSC:1062 get vblank counter failed: Invalid argument
(WW) intel(0): I830DRI2ScheduleWaitMSC:1118 get vblank counter failed: Invalid argument
Following in the tradition of commit 0ad6d6e1, limit the warnings to be
output 5 times, then quell the remainder.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34322
Ref.: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/710594
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/intel_dri.c b/src/intel_dri.c
index 7b60e14..65c8f39 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -1057,10 +1057,14 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "%s:%d get vblank counter failed: %s\n",
- __FUNCTION__, __LINE__,
- strerror(errno));
+ static int limit = 5;
+ if (limit) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
+ limit--;
+ }
return FALSE;
}
@@ -1113,10 +1117,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
vbl.request.sequence = 0;
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "%s:%d get vblank counter failed: %s\n",
- __FUNCTION__, __LINE__,
- strerror(errno));
+ static int limit = 5;
+ if (limit) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
+ limit--;
+ }
goto out_complete;
}
@@ -1143,10 +1151,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
vbl.request.signal = (unsigned long)wait_info;
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "%s:%d get vblank counter failed: %s\n",
- __FUNCTION__, __LINE__,
- strerror(errno));
+ static int limit = 5;
+ if (limit) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
+ limit--;
+ }
goto out_complete;
}
@@ -1178,10 +1190,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
vbl.request.signal = (unsigned long)wait_info;
ret = drmWaitVBlank(intel->drmSubFD, &vbl);
if (ret) {
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "%s:%d get vblank counter failed: %s\n",
- __FUNCTION__, __LINE__,
- strerror(errno));
+ static int limit = 5;
+ if (limit) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+ "%s:%d get vblank counter failed: %s\n",
+ __FUNCTION__, __LINE__,
+ strerror(errno));
+ limit--;
+ }
goto out_complete;
}
commit 0ca595e9d533019b241666d29b421c7b36f9647a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 17 15:26:35 2011 -0500
Fix IGD and IGDNG constants to be comprehensible
Since, with GPU-on-package, it's hard to talk about a model number for
a specific chipset like 855GM, just use the platform names.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/i965_render.c b/src/i965_render.c
index b1ac6ba..e42a8c4 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -401,7 +401,7 @@ static const uint32_t ps_kernel_masknoca_projective_static[][4] = {
#include "exa_wm_write.g4b"
};
-/* new programs for IGDNG */
+/* new programs for Ironlake */
static const uint32_t sf_kernel_static_gen5[][4] = {
#include "exa_sf.g4b.gen5"
};
@@ -993,7 +993,7 @@ static drm_intel_bo *gen4_create_wm_state(ScrnInfoPtr scrn,
}
/* binding table entry count is only used for prefetching, and it has to
- * be set 0 for IGDNG
+ * be set 0 for Ironlake
*/
if (IS_GEN5(intel))
wm_state->thread1.binding_table_entry_count = 0;
@@ -1386,7 +1386,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
if (IS_GEN5(intel)) {
/*
* The reason to add this extra vertex element in the header is that
- * IGDNG has different vertex header definition and origin method to
+ * Ironlake has different vertex header definition and origin method to
* set destination element offset doesn't exist anymore, which means
* hardware requires a predefined vertex element layout.
*
diff --git a/src/i965_video.c b/src/i965_video.c
index e16a575..38c8100 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -113,7 +113,7 @@ static const uint32_t ps_kernel_planar_static[][4] = {
#include "exa_wm_write.g4b"
};
-/* new program for IGDNG */
+/* new program for Ironlake */
static const uint32_t sf_kernel_static_gen5[][4] = {
#include "exa_sf.g4b.gen5"
};
@@ -675,7 +675,7 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
wm_state->thread1.binding_table_entry_count = 7;
/* binding table entry count is only used for prefetching, and it has to
- * be set 0 for IGDNG
+ * be set 0 for Ironlake
*/
if (IS_GEN5(intel))
wm_state->thread1.binding_table_entry_count = 0;
diff --git a/src/intel_driver.h b/src/intel_driver.h
index be8ec5f..d7f5dfa 100644
--- a/src/intel_driver.h
+++ b/src/intel_driver.h
@@ -76,11 +76,11 @@
#define PCI_CHIP_I945_GME_BRIDGE 0x27AC
#endif
-#ifndef PCI_CHIP_IGD_GM
-#define PCI_CHIP_IGD_GM 0xA011
-#define PCI_CHIP_IGD_GM_BRIDGE 0xA010
-#define PCI_CHIP_IGD_G 0xA001
-#define PCI_CHIP_IGD_G_BRIDGE 0xA000
+#ifndef PCI_CHIP_PINEVIEW_M
+#define PCI_CHIP_PINEVIEW_M 0xA011
+#define PCI_CHIP_PINEVIEW_M_BRIDGE 0xA010
+#define PCI_CHIP_PINEVIEW_G 0xA001
+#define PCI_CHIP_PINEVIEW_G_BRIDGE 0xA000
#endif
#ifndef PCI_CHIP_G35_G
@@ -133,9 +133,9 @@
#define PCI_CHIP_GM45_BRIDGE 0x2A40
#endif
-#ifndef PCI_CHIP_IGD_E_G
-#define PCI_CHIP_IGD_E_G 0x2E02
-#define PCI_CHIP_IGD_E_G_BRIDGE 0x2E00
+#ifndef PCI_CHIP_G45_E_G
+#define PCI_CHIP_G45_E_G 0x2E02
+#define PCI_CHIP_G45_E_G_BRIDGE 0x2E00
#endif
#ifndef PCI_CHIP_G45_G
@@ -163,14 +163,14 @@
#define PCI_CHIP_B43_G1_BRIDGE 0x2E90
#endif
-#ifndef PCI_CHIP_IGDNG_D_G
-#define PCI_CHIP_IGDNG_D_G 0x0042
-#define PCI_CHIP_IGDNG_D_G_BRIDGE 0x0040
+#ifndef PCI_CHIP_IRONLAKE_D_G
+#define PCI_CHIP_IRONLAKE_D_G 0x0042
+#define PCI_CHIP_IRONLAKE_D_G_BRIDGE 0x0040
#endif
-#ifndef PCI_CHIP_IGDNG_M_G
-#define PCI_CHIP_IGDNG_M_G 0x0046
-#define PCI_CHIP_IGDNG_M_G_BRIDGE 0x0044
+#ifndef PCI_CHIP_IRONLAKE_M_G
+#define PCI_CHIP_IRONLAKE_M_G 0x0046
+#define PCI_CHIP_IRONLAKE_M_G_BRIDGE 0x0044
#endif
#ifndef PCI_CHIP_SANDYBRIDGE_BRIDGE
diff --git a/src/intel_module.c b/src/intel_module.c
index 528ecf4..f6cc6d4 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -87,8 +87,8 @@ static const SymTabRec _intel_chipsets[] = {
{PCI_CHIP_I945_G, "945G"},
{PCI_CHIP_I945_GM, "945GM"},
{PCI_CHIP_I945_GME, "945GME"},
- {PCI_CHIP_IGD_GM, "Pineview GM"},
- {PCI_CHIP_IGD_G, "Pineview G"},
+ {PCI_CHIP_PINEVIEW_M, "Pineview GM"},
+ {PCI_CHIP_PINEVIEW_G, "Pineview G"},
{PCI_CHIP_I965_G, "965G"},
{PCI_CHIP_G35_G, "G35"},
{PCI_CHIP_I965_Q, "965Q"},
@@ -99,14 +99,14 @@ static const SymTabRec _intel_chipsets[] = {
{PCI_CHIP_Q35_G, "Q35"},
{PCI_CHIP_Q33_G, "Q33"},
{PCI_CHIP_GM45_GM, "GM45"},
- {PCI_CHIP_IGD_E_G, "4 Series"},
+ {PCI_CHIP_G45_E_G, "4 Series"},
{PCI_CHIP_G45_G, "G45/G43"},
{PCI_CHIP_Q45_G, "Q45/Q43"},
{PCI_CHIP_G41_G, "G41"},
{PCI_CHIP_B43_G, "B43"},
{PCI_CHIP_B43_G1, "B43"},
- {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
- {PCI_CHIP_IGDNG_M_G, "Arrandale"},
+ {PCI_CHIP_IRONLAKE_D_G, "Clarkdale"},
+ {PCI_CHIP_IRONLAKE_M_G, "Arrandale"},
{PCI_CHIP_SANDYBRIDGE_GT1, "Sandybridge" },
{PCI_CHIP_SANDYBRIDGE_GT2, "Sandybridge" },
{PCI_CHIP_SANDYBRIDGE_GT2_PLUS, "Sandybridge" },
@@ -137,8 +137,8 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_DEVICE_MATCH (PCI_CHIP_I945_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_I945_GM, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_I945_GME, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGD_GM, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGD_G, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_M, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_I965_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_G35_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_I965_Q, 0 ),
@@ -149,13 +149,13 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_DEVICE_MATCH (PCI_CHIP_Q35_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_Q33_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_GM45_GM, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGD_E_G, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_G45_E_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
- INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_D_G, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_M_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT1, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2_PLUS, 0 ),
@@ -182,8 +182,8 @@ static PciChipsets intel_pci_chipsets[] = {
{PCI_CHIP_I945_G, PCI_CHIP_I945_G, NULL},
{PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, NULL},
{PCI_CHIP_I945_GME, PCI_CHIP_I945_GME, NULL},
- {PCI_CHIP_IGD_GM, PCI_CHIP_IGD_GM, NULL},
- {PCI_CHIP_IGD_G, PCI_CHIP_IGD_G, NULL},
+ {PCI_CHIP_PINEVIEW_M, PCI_CHIP_PINEVIEW_M, NULL},
+ {PCI_CHIP_PINEVIEW_G, PCI_CHIP_PINEVIEW_G, NULL},
{PCI_CHIP_I965_G, PCI_CHIP_I965_G, NULL},
{PCI_CHIP_G35_G, PCI_CHIP_G35_G, NULL},
{PCI_CHIP_I965_Q, PCI_CHIP_I965_Q, NULL},
@@ -194,13 +194,13 @@ static PciChipsets intel_pci_chipsets[] = {
{PCI_CHIP_Q35_G, PCI_CHIP_Q35_G, NULL},
{PCI_CHIP_Q33_G, PCI_CHIP_Q33_G, NULL},
{PCI_CHIP_GM45_GM, PCI_CHIP_GM45_GM, NULL},
- {PCI_CHIP_IGD_E_G, PCI_CHIP_IGD_E_G, NULL},
+ {PCI_CHIP_G45_E_G, PCI_CHIP_G45_E_G, NULL},
{PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL},
{PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL},
{PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL},
{PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL},
- {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL},
- {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL},
+ {PCI_CHIP_IRONLAKE_D_G, PCI_CHIP_IRONLAKE_D_G, NULL},
+ {PCI_CHIP_IRONLAKE_M_G, PCI_CHIP_IRONLAKE_M_G, NULL},
{PCI_CHIP_SANDYBRIDGE_GT1, PCI_CHIP_SANDYBRIDGE_GT1, NULL},
{PCI_CHIP_SANDYBRIDGE_GT2, PCI_CHIP_SANDYBRIDGE_GT2, NULL},
{PCI_CHIP_SANDYBRIDGE_GT2_PLUS, PCI_CHIP_SANDYBRIDGE_GT2_PLUS, NULL},
@@ -301,11 +301,11 @@ void intel_detect_chipset(ScrnInfoPtr scrn,
chipset->name = "945GME";
chipset->info = &intel_i915_info;
Reply to: