xf86-video-intel: Branch '2.10' - src/i830_memory.c

[Eric Anholt]

 src/i830_memory.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d08782e1a17279092fa4027d98d25ef36a9f80e5
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jun 7 12:01:57 2010 -0700

    Properly align framebuffer height for tiling.
    
    This is a simple patch to avoid cherry-picking all of
    b5c9de10ba3a811f312e622b97ee5e601bd3b74f.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 7abea72..bf3072a 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -491,7 +491,7 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn)
 	/* We'll allocate the fb such that the root window will fit regardless of
 	 * rotation.
 	 */
-	fb_height = scrn->virtualY;
+	fb_height = ALIGN(scrn->virtualY, 8);
 
 	/* Calculate how much framebuffer memory to allocate.  For the
 	 * initial allocation, calculate a reasonable minimum.  This is