Merge "msm: vidc: Handle STREAMON failure in vidc driver" (b58069ad) · Commits · e / devices / android_kernel_xiaomi_markw

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -1840,8 +1840,8 @@ static int msm_vdec_start_streaming(struct vb2_queue *q, unsigned int count)
		return -EINVAL;
		}
		hdev = inst->core->device;
		dprintk(VIDC_DBG,
		"Streamon called on: %d capability\n", q->type);
		dprintk(VIDC_DBG, "Streamon called on: %d capability for inst: %p\n",
		q->type, inst);
		switch (q->type) {
		case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
		if (inst->bufq[CAPTURE_PORT].vb2_bufq.streaming)
		@@ -1856,6 +1856,12 @@ static int msm_vdec_start_streaming(struct vb2_queue *q, unsigned int count)
		rc = -EINVAL;
		goto stream_start_failed;
		}
		if (rc) {
		dprintk(VIDC_ERR,
		"Streamon failed on: %d capability for inst: %p\n",
		q->type, inst);
		goto stream_start_failed;
		}

		rc = msm_comm_qbuf(inst, NULL);
		if (rc) {

+8 −1

Original line number	Diff line number	Diff line
		@@ -1563,7 +1563,8 @@ static int msm_venc_start_streaming(struct vb2_queue *q, unsigned int count)
		return -EINVAL;
		}
		inst = q->drv_priv;
		dprintk(VIDC_DBG, "Streamon called on: %d capability\n", q->type);
		dprintk(VIDC_DBG, "Streamon called on: %d capability for inst: %p\n",
		q->type, inst);
		switch (q->type) {
		case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
		if (inst->bufq[CAPTURE_PORT].vb2_bufq.streaming)
		@@ -1578,6 +1579,12 @@ static int msm_venc_start_streaming(struct vb2_queue *q, unsigned int count)
		rc = -EINVAL;
		goto stream_start_failed;
		}
		if (rc) {
		dprintk(VIDC_ERR,
		"Streamon failed on: %d capability for inst: %p\n",
		q->type, inst);
		goto stream_start_failed;
		}

		rc = msm_comm_qbuf(inst, NULL);
		if (rc) {