[Mesa-dev] [PATCH 7/7] isl: Drop unused isl_surf_init_info::min_pitch

[Jason Ekstrand]

I made minor comments on patches 3 and 6.  With those fixed, the series is

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

On Mon, Mar 13, 2017 at 3:28 PM, Chad Versace <chadversary at chromium.org>
wrote:

> Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
> Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/intel/isl/isl.c | 13 +++----------
>  src/intel/isl/isl.h |  3 ---
>  2 files changed, 3 insertions(+), 13 deletions(-)
>
> diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
> index 0e0eb35ef52..9ef078d654a 100644
> --- a/src/intel/isl/isl.c
> +++ b/src/intel/isl/isl.c
> @@ -1041,11 +1041,7 @@ isl_calc_linear_min_row_pitch(const struct
> isl_device *dev,
>
>     assert(phys_slice0_sa->w % fmtl->bw == 0);
>
> -   uint32_t min_row_pitch = bs * (phys_slice0_sa->w / fmtl->bw);
> -   min_row_pitch = MAX2(min_row_pitch, info->min_pitch);
> -   min_row_pitch =  isl_align_npot(min_row_pitch, alignment);
> -
> -   return min_row_pitch;
> +   return isl_align_npot(bs * (phys_slice0_sa->w / fmtl->bw), alignment);
>  }
>
>  static uint32_t
> @@ -1066,11 +1062,8 @@ isl_calc_tiled_min_row_pitch(const struct
> isl_device *dev,
>        isl_align_div(total_w_el * tile_el_scale,
>                      tile_info->logical_extent_el.width);
>
> -   uint32_t min_row_pitch = total_w_tl * tile_info->phys_extent_B.width;
> -   min_row_pitch = MAX2(min_row_pitch, surf_info->min_pitch);
> -   min_row_pitch = isl_align_npot(min_row_pitch, alignment);
> -
> -   return min_row_pitch;
> +   assert(alignment == tile_info->phys_extent_B.width);
> +   return total_w_tl * tile_info->phys_extent_B.width;
>  }
>
>  static uint32_t
> diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
> index fb2bcfaec10..22069134ef8 100644
> --- a/src/intel/isl/isl.h
> +++ b/src/intel/isl/isl.h
> @@ -813,9 +813,6 @@ struct isl_surf_init_info {
>     /** Lower bound for isl_surf::alignment, in bytes. */
>     uint32_t min_alignment;
>
> -   /** Lower bound for isl_surf::pitch, in bytes. */
> -   uint32_t min_pitch;
> -
>     /**
>      * Exact value for isl_surf::row_pitch. Ignored if zero.
> isl_surf_init()
>      * will fail if this is misaligned or out of bounds.
> --
> 2.12.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170315/4b25a83f/attachment.html>