Mesa (master): radeonsi: force using staging texture when uploading to secure texture

[GitLab Mirror]

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

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri Feb 28 17:10:45 2020 +0100

radeonsi: force using staging texture when uploading to secure texture

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_texture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index ab2a234f16a..8856f0a75ce 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -1660,7 +1660,7 @@ static void *si_texture_transfer_map(struct pipe_context *ctx, struct pipe_resou
        * Use the staging texture for uploads if the underlying BO
        * is busy.
        */
-      if (!tex->surface.is_linear)
+      if (!tex->surface.is_linear || (tex->buffer.flags & RADEON_FLAG_ENCRYPTED))
          use_staging_texture = true;
       else if (usage & PIPE_TRANSFER_READ)
          use_staging_texture =