diff options
| author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2020-07-23 10:51:56 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-24 14:51:16 +0000 |
| commit | 1b0d660cbc7a0b4e856295eeb5350dfa9b45f405 (patch) | |
| tree | c7704fbf77073e4450ce7ecb0fc1303199a8d0b1 /src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | |
| parent | f5ec61767743b091e60740a1ec177829a1786682 (diff) | |
radeonsi/tmz: allow secure job if the app made a tmz allocation
This commit makes TMZ always allowed instead of being either off or forced-on
with AMD_DEBUG=tmz.
With this change:
- secure job can be used as soon as the application made a tmz allocation. Driver
internal allocations are not enough to enable secure jobs (if tmz is supported
and enabled by the kernel)
- AMD_DEBUG=tmz forces all scanout/depth/stencil buffers to be allocated as TMZ.
This is useful to test app thats don't explicitely support protected content.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6049>
Diffstat (limited to 'src/gallium/winsys/amdgpu/drm/amdgpu_cs.c')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 895b4c5a5e0..319c58cd200 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -1656,7 +1656,8 @@ void amdgpu_cs_submit_ib(void *job, int thread_index) chunks[num_chunks].chunk_data = (uintptr_t)&cs->ib[IB_MAIN]; num_chunks++; - if (ws->secure && cs->secure) { + if (cs->secure) { + assert(ws->uses_secure_bos); cs->ib[IB_PREAMBLE].flags |= AMDGPU_IB_FLAGS_SECURE; cs->ib[IB_MAIN].flags |= AMDGPU_IB_FLAGS_SECURE; } else { |