intel: Force stride to be 0 for I915_TILING_NONE.
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 21 Jun 2010 13:20:56 +0000 (14:20 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 21 Jun 2010 21:37:18 +0000 (22:37 +0100)
When allocating a tiled buffer, if we remove the desired tiling mode due
to it being beyond hardware limits, also remove the stride. This ensures
that we only ever use stride 0 with I915_TILING_NONE.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
intel/intel_bufmgr_gem.c

index b4be1af..19eea34 100644 (file)
@@ -743,6 +743,9 @@ drm_intel_gem_bo_alloc_tiled(drm_intel_bufmgr *bufmgr, const char *name,
                size = drm_intel_gem_bo_tile_size(bufmgr_gem, size, tiling_mode);
        } while (*tiling_mode != tiling);
 
+       if (*tiling_mode == I915_TILING_NONE)
+               stride = 0;
+
        bo = drm_intel_gem_bo_alloc_internal(bufmgr, name, size, flags,
                                             *tiling_mode, stride);
        if (!bo)