diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-11-20 09:01:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-20 09:01:48 -0800 |
| commit | 78191c0b55f7ee9fad196716a8242685e8a49ca2 (patch) | |
| tree | 520c237812312beb795a11690a73c0ff7e894d53 | |
| parent | e66bc7c52047535ac8aa512b611296df6f46c5ae (diff) | |
| parent | 0f6eb31b870cf9094f068b76bce3968c74b5c548 (diff) | |
| download | android_hardware_qcom_media-78191c0b55f7ee9fad196716a8242685e8a49ca2.tar.gz android_hardware_qcom_media-78191c0b55f7ee9fad196716a8242685e8a49ca2.tar.bz2 android_hardware_qcom_media-78191c0b55f7ee9fad196716a8242685e8a49ca2.zip | |
Merge "mm-video-v4l2: vidc: Enable secure playbacks on hypervisor targets"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp index dbff8f44..b644567a 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp @@ -9854,14 +9854,18 @@ bool omx_vdec::alloc_map_ion_memory(OMX_U32 buffer_size, vdec_ion *ion_info, int } #ifdef HYPERVISOR - flag = 0; + flag &= ~ION_FLAG_CACHED; #endif ion_info->alloc_data.flags = flag; ion_info->alloc_data.len = buffer_size; ion_info->alloc_data.heap_id_mask = ION_HEAP(ION_SYSTEM_HEAP_ID); if (secure_mode && (ion_info->alloc_data.flags & ION_FLAG_SECURE)) { +#ifdef HYPERVISOR + ion_info->alloc_data.heap_id_mask = ION_HEAP(ION_SECURE_DISPLAY_HEAP_ID); +#else ion_info->alloc_data.heap_id_mask = ION_HEAP(MEM_HEAP_ID); +#endif } /* Use secure display cma heap for obvious reasons. */ |