diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-31 18:57:57 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-31 18:57:57 +0000 |
| commit | 24bf59c43fbedd9d85c913ac3c7f0e752c232eb4 (patch) | |
| tree | ca76d3f56bf63575f447035a188ec272ebb7d233 | |
| parent | 770a953ff03bb8328c3f29e274d225528840f30c (diff) | |
Revert "sna: Increase the minimum alignment constraint for g33"
This reverts commit 2934e778f01cdf1307732b248b11a31c0e79e866. The actual
cause of the bug I was seeing on my PNV box turned out to be
a1f585a3d0a, so time to reinvestigate the alignment issues.
| -rw-r--r-- | src/sna/kgem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 89b464ef..969036ec 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -559,7 +559,7 @@ static uint32_t kgem_untiled_pitch(struct kgem *kgem, /* XXX workaround an issue on gen3 where we appear to fail to * disable dual-stream mode */ return ALIGN(width * bpp, - scanout || kgem->gen < 40 ? 8*64 : 8*4) >> 3; + scanout || (kgem->gen >= 30 && kgem->gen < 33) ? 8*64 : 8*4) >> 3; } static uint32_t kgem_surface_size(struct kgem *kgem, @@ -585,7 +585,7 @@ static uint32_t kgem_surface_size(struct kgem *kgem, } else switch (tiling) { default: case I915_TILING_NONE: - tile_width = scanout || kgem->gen < 40 ? 64 : 4; + tile_width = scanout || kgem->gen < 33 ? 64 : 4; tile_height = 2; break; case I915_TILING_X: |