From 5bc24fe2833b1d7d5d482787c452b92b214d9abe Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 23 Jul 2020 09:32:39 +0200 Subject: [PATCH] radeonsi/tmz: use secure job if framebuffer has dcc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes a hang with DCC. Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_descriptors.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index e41ea6b..7e859ea 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -2711,9 +2711,10 @@ bool si_gfx_resources_check_encrypted(struct si_context *sctx) struct si_texture *tex = (struct si_texture *)surf->texture; if (!(tex->buffer.flags & RADEON_FLAG_ENCRYPTED)) continue; - /* Are we reading from this framebuffer (blend) */ - if ((blend->blend_enable_4bit >> (4 * i)) & 0xf) { - /* TODO: blend op */ + + /* Are we reading from this framebuffer */ + if (((blend->blend_enable_4bit >> (4 * i)) & 0xf) || + vi_dcc_enabled(tex, 0)) { use_encrypted_bo = true; } } -- 2.7.4