Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e05e83 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Convert m2m driver to unlocked_ioctl 



Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aee7126c

drivers/media/video/s5p-fimc/fimc-core.c

+16 −6
Original line number Diff line number Diff line
@@ -983,6 +983,7 @@ int fimc_vidioc_queryctrl(struct file *file, void *priv, 
{

	struct fimc_ctx *ctx = priv;

	struct v4l2_queryctrl *c;

	int ret = -EINVAL;



	c = get_ctrl(qc->id);

	if (c) {
@@ -990,10 +991,14 @@ int fimc_vidioc_queryctrl(struct file *file, void *priv, 
		return 0;

	}



	if (ctx->state & FIMC_CTX_CAP)

		return v4l2_subdev_call(ctx->fimc_dev->vid_cap.sd,

	if (ctx->state & FIMC_CTX_CAP) {

		if (mutex_lock_interruptible(&ctx->fimc_dev->lock))

			return -ERESTARTSYS;

		ret = v4l2_subdev_call(ctx->fimc_dev->vid_cap.sd,

					core, queryctrl, qc);

	return -EINVAL;

		mutex_unlock(&ctx->fimc_dev->lock);

	}

	return ret;

}



int fimc_vidioc_g_ctrl(struct file *file, void *priv,
@@ -1233,6 +1238,9 @@ static int fimc_m2m_s_crop(struct file *file, void *fh, struct v4l2_crop *cr) 
	f = (cr->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) ?

		&ctx->s_frame : &ctx->d_frame;



	if (mutex_lock_interruptible(&fimc->lock))

		return -ERESTARTSYS;



	spin_lock_irqsave(&ctx->slock, flags);

	if (~ctx->state & (FIMC_SRC_FMT | FIMC_DST_FMT)) {

		/* Check to see if scaling ratio is within supported range */
@@ -1241,9 +1249,9 @@ static int fimc_m2m_s_crop(struct file *file, void *fh, struct v4l2_crop *cr) 
		else

			ret = fimc_check_scaler_ratio(&cr->c, &ctx->s_frame);

		if (ret) {

			spin_unlock_irqrestore(&ctx->slock, flags);

			v4l2_err(&fimc->m2m.v4l2_dev, "Out of scaler range");

			return -EINVAL;

			ret = -EINVAL;

			goto scr_unlock;

		}

	}

	ctx->state |= FIMC_PARAMS;
@@ -1253,7 +1261,9 @@ static int fimc_m2m_s_crop(struct file *file, void *fh, struct v4l2_crop *cr) 
	f->width  = cr->c.width;

	f->height = cr->c.height;



scr_unlock:

	spin_unlock_irqrestore(&ctx->slock, flags);

	mutex_unlock(&fimc->lock);

	return 0;

}
@@ -1396,7 +1406,7 @@ static const struct v4l2_file_operations fimc_m2m_fops = { 
	.open		= fimc_m2m_open,

	.release	= fimc_m2m_release,

	.poll		= fimc_m2m_poll,

	.ioctl		= video_ioctl2,

	.unlocked_ioctl	= video_ioctl2,

	.mmap		= fimc_m2m_mmap,

};