Module: Mesa Branch: main Commit: 9df5ebe5bf253673d72e86f83f571f37568f4d6d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9df5ebe5bf253673d72e86f83f571f37568f4d6d
Author: Marek Olšák <[email protected]> Date: Fri Sep 10 21:47:04 2021 -0400 radeonsi: fix DCC image stores with image descriptors in user SGPRs The bug workaround was not applied there. Fixes: 34a2c753107 - radeonsi: enable DCC stores on gfx10.3 APUs for better performance Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12809> --- .../drivers/radeonsi/si_shader_llvm_resources.c | 30 ++++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_resources.c b/src/gallium/drivers/radeonsi/si_shader_llvm_resources.c index f2a3eaa5b71..3def734a689 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm_resources.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm_resources.c @@ -161,6 +161,19 @@ static LLVMValueRef force_write_compress_off(struct si_shader_context *ctx, LLVM return LLVMBuildInsertElement(ctx->ac.builder, rsrc, tmp, i32_6, ""); } +static LLVMValueRef fixup_image_desc(struct si_shader_context *ctx, LLVMValueRef rsrc, + bool uses_store) +{ + if (uses_store && ctx->ac.chip_class <= GFX9) + rsrc = force_dcc_off(ctx, rsrc); + + if (!uses_store && ctx->screen->info.has_image_load_dcc_bug && + ctx->screen->always_allow_dcc_stores) + rsrc = force_write_compress_off(ctx, rsrc); + + return rsrc; +} + /* AC_DESC_FMASK is handled exactly like AC_DESC_IMAGE. The caller should * adjust "index" to point to FMASK. */ static LLVMValueRef si_load_image_desc(struct si_shader_context *ctx, LLVMValueRef list, @@ -182,12 +195,8 @@ static LLVMValueRef si_load_image_desc(struct si_shader_context *ctx, LLVMValueR else rsrc = ac_build_load_to_sgpr(&ctx->ac, list, index); - if (desc_type == AC_DESC_IMAGE && uses_store && ctx->ac.chip_class <= GFX9) - rsrc = force_dcc_off(ctx, rsrc); - - if (desc_type == AC_DESC_IMAGE && !uses_store && - ctx->screen->always_allow_dcc_stores && ctx->screen->info.has_image_load_dcc_bug) - rsrc = force_write_compress_off(ctx, rsrc); + if (desc_type == AC_DESC_IMAGE) + rsrc = fixup_image_desc(ctx, rsrc, uses_store); return rsrc; } @@ -297,8 +306,13 @@ static LLVMValueRef si_nir_load_sampler_desc(struct ac_shader_abi *abi, unsigned /* Fast path if the image is in user SGPRs. */ if (!dynamic_index && const_index < ctx->shader->selector->cs_num_images_in_user_sgprs && - (desc_type == AC_DESC_IMAGE || desc_type == AC_DESC_BUFFER)) - return ac_get_arg(&ctx->ac, ctx->cs_image[const_index]); + (desc_type == AC_DESC_IMAGE || desc_type == AC_DESC_BUFFER)) { + LLVMValueRef rsrc = ac_get_arg(&ctx->ac, ctx->cs_image[const_index]); + + if (desc_type == AC_DESC_IMAGE) + rsrc = fixup_image_desc(ctx, rsrc, write); + return rsrc; + } /* FMASKs are separate from images. */ if (desc_type == AC_DESC_FMASK) {
