From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Date: Thu, 23 Jul 2020 07:32:39 +0000 (+0200)
Subject: radeonsi/tmz: use secure job if framebuffer has dcc
X-Git-Tag: upstream/21.0.0~5105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bc24fe2833b1d7d5d482787c452b92b214d9abe;p=platform%2Fupstream%2Fmesa.git

radeonsi/tmz: use secure job if framebuffer has dcc

Fixes a hang with DCC.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6049>
---

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;
          }
       }