diff --git a/.pick_status.json b/.pick_status.json index e1cabb2d2d0..399894f9565 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/gallium/drivers/radeonsi/si_sdma_copy_image.c b/src/gallium/drivers/radeonsi/si_sdma_copy_image.c index 3120add84e0..49d27962549 100644 --- a/src/gallium/drivers/radeonsi/si_sdma_copy_image.c +++ b/src/gallium/drivers/radeonsi/si_sdma_copy_image.c @@ -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];