[Mesa-dev] [PATCH] intel: Don't try intel_miptree_map_blit if a region is already mapped

[Chad Versace]

On 01/26/2012 06:29 PM, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> Eventually this path leads to _intel_batchbuffer_flush.  The first
> thing there is an assertion that nothing is mapped.
> 
> Fixes the afore mentioned assertion failure in piglit's
> fbo-mipmap-copypix, and is related to bug #43328.
> 
> NOTE: This is a candidate for the 8.0 branch.
> 
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
> ---
>  src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
> index eae79c1..ae354cb 100644
> --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
> @@ -1055,7 +1055,8 @@ intel_miptree_map(struct intel_context *intel,
>     } else if (intel->gen >= 6 &&
>  	      !(mode & GL_MAP_WRITE_BIT) &&
>  	      !mt->compressed &&
> -	      mt->region->tiling == I915_TILING_X) {
> +	      mt->region->tiling == I915_TILING_X
> +	      && intel->num_mapped_regions == 0) {
>        intel_miptree_map_blit(intel, mt, map, level, slice);
>     } else {
>        intel_miptree_map_gtt(intel, mt, map, level, slice);


I'm surprised that assertion did not happen more frequently.

Reviewed-by: Chad Versace <chad.versace at linux.intel.com>