fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 15:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/sdma: fix bogus assert

Browse source 
src can use dcc even for non sdma v5 variants because si_decompress_dcc
is called in si_sdma_copy_image.

Fixes: 46c95047bd ("radeonsi: implement si_sdma_copy_image for gfx7+")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13550>
(cherry picked from commit d86d602ed0)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2021-10-28 11:56:01 +02:00 • committed by Eric Engestrom
parent 65f82f8b2d
commit ced465b4e0
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1732,7 +1732,7 @@
"description": "radeonsi/sdma: fix bogus assert",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "46c95047bd77f6e824e4edccad590da8a1823fb4"
},

3
src/gallium/drivers/radeonsi/si_sdma_copy_image.c
View file

@ -161,8 +161,7 @@ bool si_sdma_v4_v5_copy_texture(struct si_context *sctx, struct si_texture *sdst
uint64_t linear_address = linear == ssrc ? src_address : dst_address;
struct radeon_cmdbuf *cs = sctx->sdma_cs;
/* Only SDMA 5 supports DCC with SDMA */
bool dcc = vi_dcc_enabled(tiled, 0);
assert(!dcc || is_v5);
bool dcc = vi_dcc_enabled(tiled, 0) && is_v5;
assert(tiled->buffer.b.b.depth0 == 1);
linear_address += linear->surface.u.gfx9.offset[0];