Mesa (master): radeonsi: add support for PIPE_RESOURCE_FLAG_ENCRYPTED

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2c2ab36f5346a07b14ee85703316f323a77c2530
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c2ab36f5346a07b14ee85703316f323a77c2530

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri Dec  6 10:33:56 2019 +0100

radeonsi: add support for PIPE_RESOURCE_FLAG_ENCRYPTED

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

---

 src/gallium/drivers/radeonsi/si_buffer.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
index f59fd1ac406..72d5b37dcca 100644
--- a/src/gallium/drivers/radeonsi/si_buffer.c
+++ b/src/gallium/drivers/radeonsi/si_buffer.c
@@ -166,9 +166,12 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
    else
       res->flags |= RADEON_FLAG_NO_INTERPROCESS_SHARING;
 
-   if (sscreen->ws->ws_is_secure(sscreen->ws) &&
-       (res->b.b.bind & PIPE_BIND_SCANOUT))
-      res->flags |= RADEON_FLAG_ENCRYPTED;
+   if (sscreen->ws->ws_is_secure(sscreen->ws)) {
+      if (res->b.b.bind & PIPE_BIND_SCANOUT)
+         res->flags |= RADEON_FLAG_ENCRYPTED;
+      if (res->b.b.flags & PIPE_RESOURCE_FLAG_ENCRYPTED)
+         res->flags |= RADEON_FLAG_ENCRYPTED;
+   }
 
    if (sscreen->debug_flags & DBG(NO_WC))
       res->flags &= ~RADEON_FLAG_GTT_WC;