Merge "msm: vidc: Return meaningful information for extra-data plane" (1aa55cfa) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/media/platform/msm/vidc/msm_vidc_common.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -1116,6 +1116,7 @@ static void handle_fbd(enum command_response cmd, void *data)
		struct vb2_buffer *vb = NULL;
		struct vidc_hal_fbd *fill_buf_done;
		enum hal_buffer buffer_type;
		int extra_idx = 0;

		if (!response) {
		dprintk(VIDC_ERR, "Invalid response from vidc_hal\n");
		@@ -1162,6 +1163,15 @@ static void handle_fbd(enum command_response cmd, void *data)
		ns_to_timeval(time_usec * NSEC_PER_USEC);
		}
		vb->v4l2_buf.flags = 0;
		extra_idx =
		EXTRADATA_IDX(inst->fmts[CAPTURE_PORT]->num_planes);
		if (extra_idx && (extra_idx < VIDEO_MAX_PLANES)) {
		vb->v4l2_planes[extra_idx].m.userptr =
		(unsigned long)fill_buf_done->extra_data_buffer;
		vb->v4l2_planes[extra_idx].bytesused =
		vb->v4l2_planes[extra_idx].length;
		vb->v4l2_planes[extra_idx].data_offset = 0;
		}

		handle_dynamic_buffer(inst, (u32)fill_buf_done->packet_buffer1,
		fill_buf_done->flags1);
		@@ -1217,6 +1227,14 @@ static void handle_fbd(enum command_response cmd, void *data)
		vb->v4l2_planes[0].bytesused,
		vb->v4l2_planes[0].data_offset,
		vb->v4l2_buf.flags);
		if (extra_idx && (extra_idx < VIDEO_MAX_PLANES)) {
		dprintk(VIDC_DBG,
		"extradata: userptr = %p;"
		" bytesused = %d; length = %d\n",
		(u8 *)vb->v4l2_planes[extra_idx].m.userptr,
		vb->v4l2_planes[extra_idx].bytesused,
		vb->v4l2_planes[extra_idx].length);
		}
		mutex_lock(&inst->bufq[CAPTURE_PORT].lock);
		vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
		mutex_unlock(&inst->bufq[CAPTURE_PORT].lock);