Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:11.4 checked in at Thu May 12 21:04:53 CEST 2011.
-------- --- old-versions/11.4/UPDATES/all/xorg-x11-server/xorg-x11-server.changes 2011-04-26 18:27:23.000000000 +0200 +++ 11.4/xorg-x11-server/xorg-x11-server.changes 2011-05-11 16:24:14.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 11 14:16:25 UTC 2011 - [email protected] + +- EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch + * EXA/mixed: ModifyPixmapHeader pitch fixes. (bnc #678264, + bfo #33929) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.47Y8WA/_old 2011-05-12 20:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.47Y8WA/_new 2011-05-12 20:52:42.000000000 +0200 @@ -32,7 +32,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} -Release: 15.<RELEASE20> +Release: 15.<RELEASE22> License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -123,6 +123,7 @@ Patch223: use-last-screen.patch Patch224: pad-size-of-system-memory-copy-for-1x1-pixmaps Patch225: xorg-server-stop-cpu-eating.diff +Patch226: EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch %if %moblin Patch300: moblin-use_preferred_mode_for_all_outputs.diff %endif @@ -257,6 +258,7 @@ %patch223 -p1 %patch224 -p1 %patch225 -p1 +%patch226 -p1 %if %moblin %patch300 -p1 %endif ++++++ EXA-mixed-ModifyPixmapHeader-pitch-fixes.-bug-33929.patch ++++++ >From 7b3b7efe78dec87c8059ea0d0985f08a97f0633d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> Date: Thu, 24 Feb 2011 12:17:57 +0100 Subject: [PATCH] EXA/mixed: ModifyPixmapHeader pitch fixes. (bug #33929) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there's a GPU copy and a non-zero devKind was passed in, set the GPU copy pitch to that instead of to a possibly bogus value derived from the new width. This is e.g. used by the radeon driver's drmmode_xf86crtc_resize hook, fixes https://bugs.freedesktop.org/show_bug.cgi?id=33929 . On the other hand, the system memory copy doesn't need the pitch to be aligned beyond the PixmapBytePad of the width. Signed-off-by: Michel Dänzer <[email protected]> Acked-by: Cyril Brulebois <[email protected]> Tested-by: Cyril Brulebois <[email protected]> Reported-by: Thierry Vignaud <[email protected]> Tested-by: Thierry Vignaud <[email protected]> Signed-off-by: Keith Packard <[email protected]> (cherry picked from commit 31704510f448706524b7b7085cc4ff0ada7bfe7e) --- exa/exa_mixed.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index 606f1e1..fd1afb2 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -175,8 +175,10 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, depth != pPixmap->drawable.depth || bitsPerPixel != pPixmap->drawable.bitsPerPixel) { if (pExaPixmap->driverPriv) { - exaSetFbPitch(pExaScr, pExaPixmap, - width, height, bitsPerPixel); + if (devKind > 0) + pExaPixmap->fb_pitch = devKind; + else + exaSetFbPitch(pExaScr, pExaPixmap, width, height, bitsPerPixel); exaSetAccelBlock(pExaScr, pExaPixmap, width, height, bitsPerPixel); @@ -187,8 +189,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, if (has_gpu_copy && pExaPixmap->sys_ptr) { free(pExaPixmap->sys_ptr); pExaPixmap->sys_ptr = NULL; - pExaPixmap->sys_pitch = devKind > 0 ? devKind : - PixmapBytePad(width, depth); + pExaPixmap->sys_pitch = PixmapBytePad(width, depth); DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage); DamageDestroy(pExaPixmap->pDamage); pExaPixmap->pDamage = NULL; -- 1.7.4.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
