xserver: Branch 'master'

[Keith Packard]

 exa/exa_mixed.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit df2635d4644d1fa2772ff58d8d34cdf788ece412
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Thu Dec 10 00:04:53 2009 +0100

    EXA/mixed: Don't consider devKind for detecting dimension change.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=25536 .
    
    There should be no reason for the pitch to actually change when none of the
    other dimensions do, and this could lead to incorrectly freeing the system
    memory copy when allocating a GPU copy, resulting in loss of valid pixmap
    contents.
    
    Signed-off-by: Michel Dänzer <daenzer at vmware.com>
    Acked-by: Maarten Maathuis <madman2003 at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 0fb644b..155ed47 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -155,7 +155,6 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
 
     if (width != pPixmap->drawable.width ||
 	height != pPixmap->drawable.height ||
-	devKind != pPixmap->devKind ||
 	depth != pPixmap->drawable.depth ||
 	bitsPerPixel != pPixmap->drawable.bitsPerPixel) {
 	if (pExaPixmap->driverPriv) {