diff options
| author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2021-06-25 17:35:12 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-08-11 10:30:38 -0700 |
| commit | e0e7ad118007f3f04d0004e491878b8769d0bfd3 (patch) | |
| tree | 27ee86ecd234cf1324a221a44e927bc66aba4c39 | |
| parent | 4e39b6f4db2da31a927e57dd64a514ee92f76a93 (diff) | |
| download | mesa-e0e7ad118007f3f04d0004e491878b8769d0bfd3.tar.gz | |
amdgpu/bo: update uses_secure_bos when importing buffers
Fixes: 90b98c06493 ("amd/tmz: move uses_secure_bos to radeon_winsys")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11449>
(cherry picked from commit a693fbf64b84ed6364984c45dc3255b71063c6dc)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 1be6a966bdb..264b49df2f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -562,7 +562,7 @@ "description": "amdgpu/bo: update uses_secure_bos when importing buffers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "90b98c06493f8a9759e5496d5ec91fb60edf7b92" }, diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 955d95124e2..bcba77827f5 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -1580,6 +1580,7 @@ static struct pb_buffer *amdgpu_bo_from_handle(struct radeon_winsys *rws, * if it can be used for scanout. */ flags |= RADEON_FLAG_ENCRYPTED; + *((bool*)&rws->uses_secure_bos) = true; } /* Initialize the structure. */ |