Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Thu Oct 21 09:26:00 CEST 2010.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-10-08 17:53:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-10-21 01:33:38.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 20 23:25:13 UTC 2010 - sndirsch@novell.com
+
+- xf86-video-intel-a1c54f6.diff
+ * Fix violation of gen6 requirements for depthbuffer tiling.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xf86-video-intel-a1c54f6.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.rlZTel/_old 2010-10-21 09:25:13.000000000 +0200
+++ /var/tmp/diff_new_pack.rlZTel/_new 2010-10-21 09:25:13.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 26
+Release: 27
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -100,6 +100,7 @@
Patch142: xf86-video-ati-theatre-pciaccess.patch
Patch146: xf86-video-intel-fix-8784c4f.diff
Patch147: xf86-video-intel-5472359.diff
+Patch148: xf86-video-intel-a1c54f6.diff
%description
This package contains X.Org video drivers.
@@ -155,6 +156,7 @@
%patch130 -p0
%patch146 -p1
%patch147 -p1
+%patch148 -p1
popd
pushd xf86-video-nv-*
%patch132 -p1
++++++ xf86-video-intel-a1c54f6.diff ++++++
commit a1c54f69643671ce296c57d132852e9846cc41d3
Author: Eric Anholt
Date: Mon Oct 18 13:28:44 2010 -0700
Fix violation of gen6 requirements for depthbuffer tiling.
In general, demoting of tiling of DRI2 buffers seems dubious, as we've
got various bits of functionality that won't all work together unless
buffers are tiled as expected. This just covers one instance of the
problem, caught by assertions in Mesa.
Fixes:
fbo-1d
fbo-d24s8.
glean/readPixSanity
glean/rgbTriStrip
glean/scissor
diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index 23679bc..14c47a0 100644
--- a/src/intel_uxa.c
+++ b/src/intel_uxa.c
@@ -133,7 +133,8 @@ static unsigned int
intel_uxa_pixmap_compute_size(PixmapPtr pixmap,
int w, int h,
uint32_t *tiling,
- int *stride)
+ int *stride,
+ unsigned usage)
{
ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -157,7 +158,7 @@ intel_uxa_pixmap_compute_size(PixmapPtr pixmap,
*/
if (pitch > KB(8))
*tiling = I915_TILING_NONE;
- } else if (size <= 4096) {
+ } else if (!(usage & INTEL_CREATE_PIXMAP_DRI2) && size <= 4096) {
/* Disable tiling beneath a page size, we will not see
* any benefit from reducing TLB misses and instead
* just incur extra cost when we require a fence.
@@ -167,7 +168,7 @@ intel_uxa_pixmap_compute_size(PixmapPtr pixmap,
}
pitch = (w * pixmap->drawable.bitsPerPixel + 7) / 8;
- if (pitch <= 256)
+ if (!(usage & INTEL_CREATE_PIXMAP_DRI2) && pitch <= 256)
*tiling = I915_TILING_NONE;
if (*tiling != I915_TILING_NONE) {
@@ -772,7 +773,7 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap,
/* Replace busy bo. */
size = intel_uxa_pixmap_compute_size (pixmap, w, h,
- &tiling, &stride);
+ &tiling, &stride, 0);
if (size > intel->max_gtt_map_size)
return FALSE;
@@ -978,13 +979,13 @@ intel_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
if (!intel->tiling)
tiling = I915_TILING_NONE;
- if (tiling != I915_TILING_NONE) {
+ if (tiling != I915_TILING_NONE && !(usage & INTEL_CREATE_PIXMAP_DRI2)) {
if (h <= 4)
tiling = I915_TILING_NONE;
if (h <= 16 && tiling == I915_TILING_Y)
tiling = I915_TILING_X;
}
- size = intel_uxa_pixmap_compute_size(pixmap, w, h, &tiling, &stride);
+ size = intel_uxa_pixmap_compute_size(pixmap, w, h, &tiling, &stride, usage);
/* Fail very large allocations. Large BOs will tend to hit SW fallbacks
* frequently, and also will tend to fail to successfully map when doing
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org