radeonsi/gfx7: always sync pfp/me

Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/4764

Fixes: c5326164 ("radeonsi: add SI_CONTEXT_PFP_SYNC_ME to skip syncing PFP for image operations")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
(cherry picked from commit 822f377736)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2021-06-28 14:52:07 +02:00 committed by Eric Engestrom
parent bea0897878
commit 9b872e794f
2 changed files with 4 additions and 2 deletions

View file

@ -139,7 +139,7 @@
"description": "radeonsi/gfx7: always sync pfp/me",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "c53261645deca271522367e4af40393ff152eaee"
},

View file

@ -576,7 +576,9 @@ void si_emit_surface_sync(struct si_context *sctx, struct radeon_cmdbuf *cs, uns
assert(sctx->chip_class <= GFX9);
cp_coher_cntl |= 1u << 31; /* don't sync PFP, i.e. execute the sync in ME */
/* This seems problematic with GFX7 (see #4764) */
if (sctx->chip_class != GFX7)
cp_coher_cntl |= 1u << 31; /* don't sync PFP, i.e. execute the sync in ME */
radeon_begin(cs);