Mesa (staging/20.3): gallium/dri2: Don't forget protected content flag

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: adb6c1cc0ab5df7d9c8c301ab75a6850ec4e9083
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=adb6c1cc0ab5df7d9c8c301ab75a6850ec4e9083

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Mon Dec 14 21:32:55 2020 +0200

gallium/dri2: Don't forget protected content flag

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: bd182777c8f2c4 ("egl: implement EGL_EXT_protected_surface support")
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8094>
(cherry picked from commit d21cc94201ab1e6cb54ff33a7a835248fe336777)

---

 .pick_status.json                | 2 +-
 src/gallium/frontends/dri/dri2.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 51d83a30fee..607c9c482c6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -112,7 +112,7 @@
         "description": "gallium/dri2: Don't forget protected content flag",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "bd182777c8f2c4468568901ce92b1796674eb87d"
     },
diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c
index 6f98926b5db..5c935e74438 100644
--- a/src/gallium/frontends/dri/dri2.c
+++ b/src/gallium/frontends/dri/dri2.c
@@ -758,6 +758,8 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
    if (pscreen->is_format_supported(pscreen, map->pipe_format, screen->target, 0, 0,
                                     PIPE_BIND_SAMPLER_VIEW))
       tex_usage |= PIPE_BIND_SAMPLER_VIEW;
+   if (is_protected_content)
+      tex_usage |= PIPE_BIND_PROTECTED;
 
    /* For NV12, see if we have support for sampling r8_b8g8 */
    if (!tex_usage && map->pipe_format == PIPE_FORMAT_NV12 &&