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

Commit 4203db6e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm-camera2:isp2: Remove the lock during the stream config"

parents e2a79415 f63596bf

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+0 −4
Original line number Diff line number Diff line
@@ -912,9 +912,7 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
	case VIDIOC_MSM_ISP_CFG_STREAM:

		mutex_lock(&vfe_dev->core_mutex);

		MSM_ISP_DUAL_VFE_MUTEX_LOCK(vfe_dev);

		mutex_lock(&vfe_dev->buf_mgr->lock);

		rc = msm_isp_cfg_axi_stream(vfe_dev, arg);

		mutex_unlock(&vfe_dev->buf_mgr->lock);

		MSM_ISP_DUAL_VFE_MUTEX_UNLOCK(vfe_dev);

		mutex_unlock(&vfe_dev->core_mutex);

		break;
@@ -1031,9 +1029,7 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
	case VIDIOC_MSM_ISP_CFG_STATS_STREAM:

		mutex_lock(&vfe_dev->core_mutex);

		MSM_ISP_DUAL_VFE_MUTEX_LOCK(vfe_dev);

		mutex_lock(&vfe_dev->buf_mgr->lock);

		rc = msm_isp_cfg_stats_stream(vfe_dev, arg);

		mutex_unlock(&vfe_dev->buf_mgr->lock);

		MSM_ISP_DUAL_VFE_MUTEX_UNLOCK(vfe_dev);

		mutex_unlock(&vfe_dev->core_mutex);

		break;