isl: Take bpb rather than bs in tiling_get_info

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

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 29b33d92b117f20b64d6810cc370a8301a1aabaf..f6c9200674c55287906adcd6eb55fd29c59f4279 100644 (file)
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -107,10 +107,10 @@ isl_device_get_sample_counts(struct isl_device *dev)
 bool
 isl_tiling_get_info(const struct isl_device *dev,
                     enum isl_tiling tiling,
-                    uint32_t format_block_size,
+                    uint32_t format_bpb,
                     struct isl_tile_info *tile_info)
 {
-   const uint32_t bs = format_block_size;
+   const uint32_t bs = format_bpb / 8;
    struct isl_extent2d logical_el, phys_B;
 
    assert(bs > 0);
@@ -1063,7 +1063,7 @@ isl_surf_init_s(const struct isl_device *dev,
       return false;
 
    struct isl_tile_info tile_info;
-   if (!isl_tiling_get_info(dev, tiling, fmtl->bs, &tile_info))
+   if (!isl_tiling_get_info(dev, tiling, fmtl->bpb, &tile_info))
       return false;
 
    enum isl_msaa_layout msaa_layout;
@@ -1180,7 +1180,7 @@ isl_surf_get_tile_info(const struct isl_device *dev,
                        struct isl_tile_info *tile_info)
 {
    const struct isl_format_layout *fmtl = isl_format_get_layout(surf->format);
-   isl_tiling_get_info(dev, surf->tiling, fmtl->bs, tile_info);
+   isl_tiling_get_info(dev, surf->tiling, fmtl->bpb, tile_info);
 }
 
 void
@@ -1466,7 +1466,7 @@ isl_tiling_get_intratile_offset_el(const struct isl_device *dev,
    }
 
    struct isl_tile_info tile_info;
-   isl_tiling_get_info(dev, tiling, bs, &tile_info);
+   isl_tiling_get_info(dev, tiling, bs * 8, &tile_info);
 
    /* Compute the offset into the tile */
    *x_offset_el = total_x_offset_el % tile_info.logical_extent_el.w;

diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index f74c071705d41462a92498674bc009019d9e88f8..5c697a64d5e405cdb05d933a952973aaf725da53 100644 (file)
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -1031,7 +1031,7 @@ isl_tiling_is_std_y(enum isl_tiling tiling)
 bool
 isl_tiling_get_info(const struct isl_device *dev,
                     enum isl_tiling tiling,
-                    uint32_t format_block_size,
+                    uint32_t format_bpb,
                     struct isl_tile_info *info);
 bool
 isl_surf_choose_tiling(const struct isl_device *dev,