fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi/vcn: add drm key for cenc

Browse source 
Add new function to handle drm message buffer for cenc, which is
different than legacy mode.

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34854>
This commit is contained in:
Boyuan Zhang 2025-03-13 22:13:05 -04:00 • committed by Marge Bot
parent d6e2438113
commit 2b6ecc8269
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/common/ac_vcn_dec.h
View file

@ -350,6 +350,7 @@
#define DRM_CMD_DRM_BYPASS_MASK (0x80000000)
/* Drm_cntl definitions */
#define DRM_CNTL_CENC_ENABLE_SHIFT (0)
#define DRM_CNTL_ENC_BYTECNT_SHIFT (6)
#define DRM_CNTL_CLR_BYTECNT_SHIFT (16)
#define DRM_CNTL_BYPASS_SHIFT (24)

30
src/gallium/drivers/radeonsi/radeon_vcn_dec.c
View file

@ -655,6 +655,31 @@ static void get_h265_reflist(rvcn_dec_message_hevc_direct_ref_list_t *hevc_refli
}
}
static void set_drm_keys_cenc(rvcn_dec_message_drm_t *drm, amd_secure_buffer_format *secure_buf)
{
drm->drm_offset = 0;
drm->drm_cmd = 0;
drm->drm_cntl = 0;
drm->drm_max_res = 0;
memcpy(drm->drm_wrapped_key, secure_buf->key_blob.wrapped_key, 16);
memcpy(drm->drm_key, secure_buf->key_blob.wrapped_key_iv, 16);
memcpy(drm->drm_counter, secure_buf->desc.iv, 16);
drm->drm_subsample_size = secure_buf->desc.subsamples_length;
drm->drm_cmd |= 1 << DRM_CMD_KEY_SHIFT;
drm->drm_cmd |= 1 << DRM_CMD_CNT_KEY_SHIFT;
drm->drm_cmd |= 1 << DRM_CMD_CNT_DATA_SHIFT;
drm->drm_cmd |= 1 << DRM_CMD_OFFSET_SHIFT;
drm->drm_cmd |= 1 << DRM_CMD_GEN_MASK_SHIFT;
drm->drm_cmd |= 0xFF << DRM_CMD_BYTE_MASK_SHIFT;
drm->drm_cmd |= secure_buf->key_blob.u.s.drm_session_id << DRM_CMD_SESSION_SEL_SHIFT;
drm->drm_cmd |= 1 << DRM_CMD_UNWRAP_KEY_SHIFT;
drm->drm_cntl |= 0x3 << DRM_CNTL_CENC_ENABLE_SHIFT;
}
static void set_drm_keys(rvcn_dec_message_drm_t *drm, DECRYPT_PARAMETERS *decrypted)
{
int cbc = decrypted->u.s.cbc;
@ -1815,7 +1840,10 @@ static struct pb_buffer_lean *rvcn_dec_message_decode(struct radeon_decoder *dec
if (encrypted) {
assert(sscreen->info.has_tmz_support);
set_drm_keys(drm, decrypt);
if (picture->cenc)
set_drm_keys_cenc(drm, secure_buf);
else
set_drm_keys(drm, decrypt);
}
if (dec->dpb_type == DPB_DYNAMIC_TIER_1) {