fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-22 12:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: fix AMD_TEST=computeblit being rejected on gfx < 11

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21860>
This commit is contained in:
Marek Olšák 2022-11-06 21:35:37 -05:00 • committed by Marge Bot
parent f67b41e53b
commit e7d7fc6740
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_blit.c
View file

@ -1230,7 +1230,7 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
return;
}
if (si_compute_blit(sctx, info))
if (si_compute_blit(sctx, info, false))
return;
si_gfx_blit(ctx, info);

4
src/gallium/drivers/radeonsi/si_compute_blit.c
View file

@ -1078,7 +1078,7 @@ static bool si_should_blit_clamp_xy(const struct pipe_blit_info *info)
return !in_bounds;
}
bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info)
bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info, bool testing)
{
/* Compute blits require D16 right now (see the ISA).
*
@ -1088,7 +1088,7 @@ bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info)
*
* TODO: benchmark the performance on gfx11
*/
if (sctx->gfx_level < GFX11)
if (sctx->gfx_level < GFX11 && !testing)
return false;
if (!si_can_use_compute_blit(sctx, info->dst.format, info->dst.resource->nr_samples, true,

2
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -1443,7 +1443,7 @@ void si_retile_dcc(struct si_context *sctx, struct si_texture *tex);
void gfx9_clear_dcc_msaa(struct si_context *sctx, struct pipe_resource *res, uint32_t clear_value,
unsigned flags, enum si_coherency coher);
void si_compute_expand_fmask(struct pipe_context *ctx, struct pipe_resource *tex);
bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info);
bool si_compute_blit(struct si_context *sctx, const struct pipe_blit_info *info, bool testing);
void si_init_compute_blit_functions(struct si_context *sctx);
/* si_cp_dma.c */

2
src/gallium/drivers/radeonsi/si_test_image_copy_region.c
View file

@ -948,7 +948,7 @@ void si_test_blit(struct si_screen *sscreen, unsigned test_flags)
if (only_cb_resolve)
success = si_msaa_resolve_blit_via_CB(ctx, &info);
else
success = si_compute_blit(sctx, &info);
success = si_compute_blit(sctx, &info, true);
if (success) {
printf(" %-7s", only_cb_resolve ? "resolve" : "comp");