isl: Drop unused isl_surf_init_info::min_pitch

Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Chad Versace 2017-03-10 13:58:13 -08:00
parent 6cbc13d94c
commit d1032a047b
2 changed files with 3 additions and 13 deletions

View File

@ -1043,11 +1043,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
@ -1068,11 +1064,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

View File

@ -810,9 +810,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.