diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-19 09:10:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-19 09:10:36 -0700 |
| commit | 1882097f98f3f23fa7b4c9e35bc2a2ed52cf3d31 (patch) | |
| tree | 1b09b3ceff65951c47ea7d260fdef447857a8d78 | |
| parent | dce705e4216de9640880aca8b296acb92b8c0544 (diff) | |
| parent | f9b8fd3627011ce05c8007855137db3401e61c05 (diff) | |
Merge "msm: vidc: Fix issue in cache operation range"
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c index 2b3070974df8..de4705c3d2eb 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc.c +++ b/drivers/media/platform/msm/vidc/msm_vidc.c @@ -826,7 +826,8 @@ int output_buffer_cache_invalidate(struct msm_vidc_inst *inst, if (inst->session_type == MSM_VIDC_ENCODER && !i) - size = b->m.planes[i].bytesused; + size = b->m.planes[i].bytesused + + b->m.planes[i].data_offset; else size = -1; @@ -1060,7 +1061,8 @@ int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b) if (binfo->handle[i] && (b->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)) { if (inst->session_type == MSM_VIDC_DECODER && !i) - size = b->m.planes[i].bytesused; + size = b->m.planes[i].bytesused + + b->m.planes[i].data_offset; else size = -1; rc = msm_comm_smem_cache_operations(inst, |