Reviewed-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> for this series.
On Tue, Dec 26, 2017 at 11:19 PM, Dave Airlie <airl...@gmail.com> wrote: > From: Dave Airlie <airl...@redhat.com> > > These are just taken from amdvlk, we probably knew these already, > but may as well port them now. > > Signed-off-by: Dave Airlie <airl...@redhat.com> > --- > src/amd/common/sid.h | 6 ++++++ > src/amd/vulkan/radv_device.c | 6 +++--- > src/gallium/drivers/radeonsi/si_state.c | 6 +++--- > 3 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h > index 59a7e2a06e..3588d39d62 100644 > --- a/src/amd/common/sid.h > +++ b/src/amd/common/sid.h > @@ -8954,9 +8954,15 @@ > #define S_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE(x) > (((unsigned)(x) & 0x03) << 2) > #define G_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE(x) (((x) > >> 2) & 0x03) > #define C_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE > 0xFFFFFFF3 > +#define V_028C78_MAX_BLOCK_SIZE_64B 0 > +#define V_028C78_MAX_BLOCK_SIZE_128B 1 > +#define V_028C78_MAX_BLOCK_SIZE_256B 2 > + > #define S_028C78_MIN_COMPRESSED_BLOCK_SIZE(x) > (((unsigned)(x) & 0x1) << 4) > #define G_028C78_MIN_COMPRESSED_BLOCK_SIZE(x) (((x) > >> 4) & 0x1) > #define C_028C78_MIN_COMPRESSED_BLOCK_SIZE > 0xFFFFFFEF > +#define V_028C78_MIN_BLOCK_SIZE_32B 0 > +#define V_028C78_MIN_BLOCK_SIZE_64B 1 > #define S_028C78_MAX_COMPRESSED_BLOCK_SIZE(x) > (((unsigned)(x) & 0x03) << 5) > #define G_028C78_MAX_COMPRESSED_BLOCK_SIZE(x) (((x) > >> 5) & 0x03) > #define C_028C78_MAX_COMPRESSED_BLOCK_SIZE > 0xFFFFFF9F > diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c > index 9ea2b92013..63be8c53a9 100644 > --- a/src/amd/vulkan/radv_device.c > +++ b/src/amd/vulkan/radv_device.c > @@ -3161,12 +3161,12 @@ radv_initialise_color_surface(struct radv_device > *device, > cb->cb_color_info |= S_028C70_DCC_ENABLE(1); > > if (device->physical_device->rad_info.chip_class >= VI) { > - unsigned max_uncompressed_block_size = 2; > + unsigned max_uncompressed_block_size = > V_028C78_MAX_BLOCK_SIZE_256B; > if (iview->image->info.samples > 1) { > if (iview->image->surface.bpe == 1) > - max_uncompressed_block_size = 0; > + max_uncompressed_block_size = > V_028C78_MAX_BLOCK_SIZE_64B; > else if (iview->image->surface.bpe == 2) > - max_uncompressed_block_size = 1; > + max_uncompressed_block_size = > V_028C78_MAX_BLOCK_SIZE_128B; > } > > cb->cb_dcc_control = > S_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE(max_uncompressed_block_size) | > diff --git a/src/gallium/drivers/radeonsi/si_state.c > b/src/gallium/drivers/radeonsi/si_state.c > index 5c4c38368f..544bf6aa2f 100644 > --- a/src/gallium/drivers/radeonsi/si_state.c > +++ b/src/gallium/drivers/radeonsi/si_state.c > @@ -2450,13 +2450,13 @@ static void si_initialize_color_surface(struct > si_context *sctx, > } > > if (sctx->b.chip_class >= VI) { > - unsigned max_uncompressed_block_size = 2; > + unsigned max_uncompressed_block_size = > V_028C78_MAX_BLOCK_SIZE_256B; > > if (rtex->resource.b.b.nr_samples > 1) { > if (rtex->surface.bpe == 1) > - max_uncompressed_block_size = 0; > + max_uncompressed_block_size = > V_028C78_MAX_BLOCK_SIZE_64B; > else if (rtex->surface.bpe == 2) > - max_uncompressed_block_size = 1; > + max_uncompressed_block_size = > V_028C78_MAX_BLOCK_SIZE_128B; > } > > surf->cb_dcc_control = > S_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE(max_uncompressed_block_size) | > -- > 2.14.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev