From c3f5cca88f3df88ef7abde229786dca7342ddbcd Mon Sep 17 00:00:00 2001 From: Prabhakar Reddy Krishnappa Date: Thu, 18 May 2017 17:43:17 -0700 Subject: msm: vidc: Cancel userptr validation during secure decode Secure decode doesn't need userptr and uses ion fd instead. We were conducting userptr validation regardless of the decode mode (secure/ unsecure). This forced user to populate userptr with a dummy value during QBUF in secure mode decode on both output and capture ports to avoid a userptr validation fail. CRs-Fixed: 2049213 Change-Id: I0060efb52792201a2634072f648a537ebb02d17c Signed-off-by: Prabhakar Reddy Krishnappa --- drivers/media/platform/msm/vidc/msm_vidc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c index 644203b65999..1ff2ca4cb91f 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc.c +++ b/drivers/media/platform/msm/vidc/msm_vidc.c @@ -970,7 +970,7 @@ int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b) b->m.planes[i].m.userptr = buffer_info->uvaddr[i]; b->m.planes[i].reserved[0] = buffer_info->fd[i]; b->m.planes[i].reserved[1] = buffer_info->buff_off[i]; - if (!b->m.planes[i].m.userptr) { + if (!(inst->flags & VIDC_SECURE) && !b->m.planes[i].m.userptr) { dprintk(VIDC_ERR, "%s: Failed to find user virtual address, %#lx, %d, %d\n", __func__, b->m.planes[i].m.userptr, b->type, i); -- cgit v1.2.3