summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-06-07 13:42:52 -0700
committerEric Anholt <eric@anholt.net>2010-06-07 13:43:18 -0700
commit707177b69ff14f6e73aed3155d681297b10189ef (patch)
tree1777f1154a6d138a8cb7c104a6ca16e71f7b25a4
parent9acf10762b5f3d3b1b33ea07792a936a25e45010 (diff)
Properly align framebuffer height for tiling.2.9
This is a simple patch to avoid cherry-picking all of b5c9de10ba3a811f312e622b97ee5e601bd3b74f. (cherry picked from commit d08782e1a17279092fa4027d98d25ef36a9f80e5) Conflicts: src/i830_memory.c
-rw-r--r--src/i830_memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 26e4cfde..2a3463e6 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