xserver: Branch 'master'

[Dave Airlie]

 exa/exa.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1373c2ea877b562076a4a3c97e8e4f999c977217
Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Aug 15 12:14:26 2009 +1000

    exa: clarify createpixmap2 new pitch return

diff --git a/exa/exa.h b/exa/exa.h
index 1fdc383..4b39473 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -708,7 +708,9 @@ typedef struct _ExaDriver {
                               int depth, int bitsPerPixel, int devKind,
                               pointer pPixData);
 
-    /* if the driver is going to tile the buffer it may need to adjust the pitch alignment */
+    /* hooks for drivers with tiling support:
+     * driver MUST fill out new_fb_pitch with valid pitch of pixmap
+     */
     void *(*CreatePixmap2)(ScreenPtr pScreen, int width, int height,
 			   int depth, int usage_hint, int bitsPerPixel,
 			   int *new_fb_pitch);