author | apollo.ling <apollo.ling@amlogic.com> | 2020-07-24 11:45:00 (GMT) |
---|---|---|
committer | Shen Liu <shen.liu@amlogic.com> | 2020-08-13 12:04:11 (GMT) |
commit | f9c065b1cb15a45e0290305f0a743998112a9a16 (patch) | |
tree | 3d0d35117a6555d8df0872d34d0e19add3615caf | |
parent | 05b80212a758d08842fe171139d0313c3aef0ece (diff) | |
download | media_modules-f9c065b1cb15a45e0290305f0a743998112a9a16.zip media_modules-f9c065b1cb15a45e0290305f0a743998112a9a16.tar.gz media_modules-f9c065b1cb15a45e0290305f0a743998112a9a16.tar.bz2 |
vdec: fix parser permision rights confusion [1/1]
PD#SWPL-29762
Problem:
When secure and non secure mode at the same time,persion rights conflicted
Solution:
correct the parser permision rights confusion.
Verify:
u215
Change-Id: I47987e793aa0af05dd07ec3a13de9f38c7444ac5
Signed-off-by: apollo.ling <apollo.ling@amlogic.com>
-rw-r--r-- | drivers/frame_provider/decoder/utils/vdec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/frame_provider/decoder/utils/vdec.c b/drivers/frame_provider/decoder/utils/vdec.c index fc160e3..2c2d40a 100644 --- a/drivers/frame_provider/decoder/utils/vdec.c +++ b/drivers/frame_provider/decoder/utils/vdec.c @@ -2469,14 +2469,9 @@ void vdec_prepare_run(struct vdec_s *vdec, unsigned long mask) if (!vdec_core_with_input(mask)) return; - if (secure && vdec_stream_based(vdec) && force_nosecure_even_drm) + if (vdec_stream_based(vdec) && !vdec_secure(vdec)) { - /* Verimatrix ultra webclient (HLS) was played in drmmode and used hw demux. In drmmode VDEC only can access secure. - Now HW demux parsed es data to no-secure buffer. So the VDEC input was no-secure, VDEC playback failed. Forcing - use nosecure for verimatrix webclient HLS. If in the future HW demux can parse es data to secure buffer, make - VDEC r/w secure.*/ - secure = 0; - //pr_debug("allow VDEC can access nosecure even in drmmode\n"); + tee_config_device_secure(DMC_DEV_ID_PARSER, 0); } if (input->target == VDEC_INPUT_TARGET_VLD) tee_config_device_secure(DMC_DEV_ID_VDEC, secure); |