Mesa (main): radeonsi: fix encryption check for buffers

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8baa77c8139e9c8754d0d482774ae4d04cb66f60
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8baa77c8139e9c8754d0d482774ae4d04cb66f60

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Tue Jun  1 16:54:29 2021 +0200

radeonsi: fix encryption check for buffers

The writable bit means read-write, not just write.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Fixes: 8873ea0e253 ("radeonsi: determine secure flag must be set for gfx IB")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11107>

---

 src/gallium/drivers/radeonsi/si_descriptors.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 7baf6084505..0aff0082fd8 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -1033,9 +1033,7 @@ static bool si_buffer_resources_check_encrypted(struct si_context *sctx,
    while (mask) {
       int i = u_bit_scan64(&mask);
 
-      /* only check for reads */
-      if ((buffers->writable_mask & (1llu << i)) == 0 &&
-          (si_resource(buffers->buffers[i])->flags & RADEON_FLAG_ENCRYPTED))
+      if (si_resource(buffers->buffers[i])->flags & RADEON_FLAG_ENCRYPTED)
          return true;
    }