From cd34cbeb9f5c65b25d241700f27c16b36e1ecce6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 22 Jun 2010 11:07:26 +0100 Subject: intel: Sanitise strides for linear buffers and SET_TILING Ensure that the user doesn't attempt to specify a stride to use with a linear buffer by forcing such to be zero. Signed-off-by: Chris Wilson --- intel/intel_bufmgr_gem.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'intel') diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 37b74677..14b6d7bb 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -1735,6 +1735,12 @@ drm_intel_gem_bo_set_tiling(drm_intel_bo *bo, uint32_t * tiling_mode, if (bo_gem->global_name == 0) return 0; + /* Linear buffers have no stride. By ensuring that we only ever use + * stride 0 with linear buffers, we simplify our code. + */ + if (*tiling_mode === I915_TILING_NONE) + stride = 0; + ret = drm_intel_gem_bo_set_tiling_internal(bo, *tiling_mode, stride); if (ret == 0) drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); -- cgit v1.2.3