diff options
| -rw-r--r-- | src/intel/isl/isl.c | 13 | ||||
| -rw-r--r-- | 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 98a1152c282..c7072d09025 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -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 diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h index 012be7b98e7..17b52cf2f4f 100644 --- a/src/intel/isl/isl.h +++ b/src/intel/isl/isl.h @@ -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. |