[Mesa-stable] [PATCH] i965/tex: Don't pass samples to miptree_create_for_teximage

[Andres Gomez]

Jason, 76e2f390f9863a35 didn't land in 17.1 so I understand this is not
really needed there and we only need it for 17.2.

WDYT? 

On Sat, 2017-08-19 at 11:07 -0700, Jason Ekstrand wrote:
> In 76e2f390f9863a35, when Topi switched num_samples from 0 to 1 for
> single-sampled, he accidentally switched the last parameter in the call
> to miptree_create_for_teximage from 0 to 1 thinking it was num_samples
> when it was actually layout_flags.  Switching from 0 to 1 added the
> MIPTREE_LAYOUT_ACCELERATED_UPLOAD flag which causes us to allocate a
> busy BO instead of an idle one.  This caused the subsequent CPU upload
> to consistently stall.  The end result was a 15% performance drop in the
> SynMark v7 DrvRes microbenchmark.  This restores the old behavior and
> fixes the performance regression.
> 
> Cc: Kenneth Graunke <kenneth at whitecape.org>
> Cc: Topi Pohjolainen <topi.pohjolainen at intel.com>
> Fixes: 76e2f390f9863a356d1419982dec705260d67eff
> Bugzilla: https://bugs.freedesktop.org/102260
> Cc: mesa-stable at lists.freedesktop.org
> ---
>  src/mesa/drivers/dri/i965/intel_tex.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c
> index 890c82d..94a7ad3 100644
> --- a/src/mesa/drivers/dri/i965/intel_tex.c
> +++ b/src/mesa/drivers/dri/i965/intel_tex.c
> @@ -94,7 +94,7 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx,
>     } else {
>        intel_image->mt = intel_miptree_create_for_teximage(brw, intel_texobj,
>                                                            intel_image,
> -                                                          1 /* samples */);
> +                                                          MIPTREE_CREATE_DEFAULT);
>        if (!intel_image->mt)
>           return false;
>  
-- 
Br,

Andres