diff --git a/msm/eva/msm_cvp_buf.c b/msm/eva/msm_cvp_buf.c index 73c32b7816..b1d69ba07c 100644 --- a/msm/eva/msm_cvp_buf.c +++ b/msm/eva/msm_cvp_buf.c @@ -1068,7 +1068,8 @@ void msm_cvp_cache_operations(struct msm_cvp_smem *smem, u32 type, } static struct msm_cvp_smem *msm_cvp_session_find_smem(struct msm_cvp_inst *inst, - struct dma_buf *dma_buf) + struct dma_buf *dma_buf, + u32 pkt_type) { struct msm_cvp_smem *smem; int i; @@ -1082,6 +1083,7 @@ static struct msm_cvp_smem *msm_cvp_session_find_smem(struct msm_cvp_inst *inst, SET_USE_BITMAP(i, inst); smem = inst->dma_cache.entries[i]; smem->bitmap_index = i; + smem->pkt_type = pkt_type; atomic_inc(&smem->refcount); /* * If we find it, it means we already increased @@ -1182,7 +1184,7 @@ static struct msm_cvp_smem *msm_cvp_session_get_smem(struct msm_cvp_inst *inst, return smem; } - smem = msm_cvp_session_find_smem(inst, dma_buf); + smem = msm_cvp_session_find_smem(inst, dma_buf, pkt_type); if (!smem) { found = 0; smem = kmem_cache_zalloc(cvp_driver->smem_cache, GFP_KERNEL); diff --git a/msm/eva/msm_cvp_common.c b/msm/eva/msm_cvp_common.c index a07498c7c8..f9e860a7d2 100644 --- a/msm/eva/msm_cvp_common.c +++ b/msm/eva/msm_cvp_common.c @@ -1563,7 +1563,7 @@ int cvp_print_inst(u32 tag, struct msm_cvp_inst *inst) dprintk(tag, "%s inst stype %d %pK id = %#x ptype %#x prio %#x secure %#x kmask %#x dmask %#x, kref %#x state %#x\n", inst->proc_name, inst->session_type, inst, hash32_ptr(inst->session), inst->prop.type, inst->prop.priority, inst->prop.is_secure, - inst, inst->prop.kernel_mask, inst->prop.dsp_mask, + inst->prop.kernel_mask, inst->prop.dsp_mask, kref_read(&inst->kref), inst->state); return 0;