summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2011-03-26 12:59:23 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2011-03-26 12:59:23 +0100
commit47f221a54d5836d0be00ba215c0c8f70752327cf (patch)
tree4738958dd23070387c9aa2a964ea04dacef8b2e0
parent7ccbec801e9ee32fc110db730dfec674a94dea21 (diff)
Cleanup gen2 tiling confusiongen2-tile-cleanup
A tile on gen2 has a size of 2kb, stride of 128 bytes and 16 rows. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--src/intel_uxa.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index 13d8cf93..662bcc7e 100644
--- a/src/intel_uxa.c
+++ b/src/intel_uxa.c
@@ -197,13 +197,12 @@ intel_uxa_pixmap_compute_size(PixmapPtr pixmap,
if (*tiling != I915_TILING_NONE) {
int aligned_h, tile_height;
- if (*tiling == I915_TILING_X)
+ if (IS_GEN2(intel))
+ tile_height = 16;
+ else if (*tiling == I915_TILING_X)
tile_height = 8;
else
tile_height = 32;
- /* i8xx has a 2-row interleaved tile layout */
- if (IS_GEN2(intel))
- tile_height *= 2;
aligned_h = ALIGN(h, tile_height);
*stride = intel_get_fence_pitch(intel,