Merge "msm: sde: Remove output fence object after user request completed" (9bda357a) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ static void sde_rotator_stop_streaming(struct vb2_queue *q)
		struct sde_rotator_vbinfo *vbinfo =
		&ctx->vbinfo_cap[i];

		if (vbinfo->fence && vbinfo->fd < 0) {
		if (vbinfo->fence) {
		/* fence is not used */
		SDEDEV_DBG(rot_dev->dev,
		"put fence s:%d t:%d i:%d\n",
		@@ -1457,7 +1457,7 @@ static int sde_rotator_dqbuf(struct file *file,
		&& (buf->index < ctx->nbuf_cap)) {
		int idx = buf->index;

		if (ctx->vbinfo_cap[idx].fence && ctx->vbinfo_cap[idx].fd < 0) {
		if (ctx->vbinfo_cap[idx].fence) {
		/* fence is not used */
		SDEDEV_DBG(ctx->rot_dev->dev, "put fence s:%d i:%d\n",
		ctx->session_id, idx);
		@@ -1854,6 +1854,7 @@ static long sde_rotator_private_ioctl(struct file file, void fh,
		ctx->session_id);
		return vbinfo->fd;
		}
		vbinfo->fence = NULL;
		}
		fence->fd = vbinfo->fd;