diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-18 10:55:17 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-18 15:11:31 +0000 |
| commit | 7ce5f4a11389b2fe9f27a6f09c4848ac71424d5d (patch) | |
| tree | b6a4689d477a7d87be32d79827b2a1463f6081f4 | |
| parent | 342dda3fe361c8be2f3af5af1516cdc6a5fdcaa9 (diff) | |
sna/gen3: Do not force tiling for large pixmaps
As the extraction routine is now smarter and can construction
subsurfaces without copying we do not need to force tiling.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/kgem.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 8a2222cf..bb09214e 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -2300,17 +2300,11 @@ int kgem_choose_tiling(struct kgem *kgem, int tiling, int width, int height, int return tiling < 0 ? tiling : I915_TILING_NONE; if (kgem->gen < 40) { - if (tiling) { - if (width * bpp > 8192 * 8) { - DBG(("%s: pitch too large for tliing [%d]\n", - __FUNCTION__, width*bpp/8)); - tiling = I915_TILING_NONE; - goto done; - } else if ((width|height) > 2048) { - DBG(("%s: large buffer (%dx%d), forcing TILING_X\n", - __FUNCTION__, width, height)); - tiling = -I915_TILING_X; - } + if (tiling && width * bpp > 8192 * 8) { + DBG(("%s: pitch too large for tliing [%d]\n", + __FUNCTION__, width*bpp/8)); + tiling = I915_TILING_NONE; + goto done; } } else { if (width*bpp > (MAXSHORT-512) * 8) { |