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

[Eric Anholt]

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

New commits:
commit 707177b69ff14f6e73aed3155d681297b10189ef
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jun 7 13:42:52 2010 -0700

    Properly align framebuffer height for tiling.
    
    This is a simple patch to avoid cherry-picking all of
    b5c9de10ba3a811f312e622b97ee5e601bd3b74f.
    (cherry picked from commit d08782e1a17279092fa4027d98d25ef36a9f80e5)
    
    Conflicts:
    
    	src/i830_memory.c

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