From: Eric Anholt <eric@anholt.net>
Date: Sat, 8 Aug 2009 01:09:31 +0000 (-0700)
Subject: intel: Align region height as required for tiled regions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ceb8afcca5b0a52b005a782ea54b301beaee1a15;p=mesa.git

intel: Align region height as required for tiled regions.

Otherwise, we would address beyond the end of our buffers.  Fixes reliable
GPU segfault with texture_tiling=true and oglconform shadow.c.

Bug #22406.
---

diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 69574f24321..497f7967649 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -181,6 +181,11 @@ intel_region_alloc(struct intel_context *intel,
    dri_bo *buffer;
    struct intel_region *region;
 
+   if (tiling == I915_TILING_X)
+      height = ALIGN(height, 8);
+   else if (tiling == I915_TILING_Y)
+      height = ALIGN(height, 32);
+
    if (expect_accelerated_upload) {
       buffer = drm_intel_bo_alloc_for_render(intel->bufmgr, "region",
 					     pitch * cpp * height, 64);