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

Commit 67c0ac5f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Lock buffer manager operations"

parents 56695d3e 9462fce2

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

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ static int vfe_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, &vfe_dev->subdev.sd);

	mutex_init(&vfe_dev->realtime_mutex);

	mutex_init(&vfe_dev->core_mutex);

	mutex_init(&vfe_dev->buf_mgr_mutex);

	spin_lock_init(&vfe_dev->tasklet_lock);

	spin_lock_init(&vfe_dev->shared_data_lock);

	spin_lock_init(&req_history_lock);

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ struct vfe_device { 
	struct completion stats_config_complete;

	struct mutex realtime_mutex;

	struct mutex core_mutex;

	struct mutex buf_mgr_mutex;



	atomic_t irq_cnt;

	uint8_t taskletq_idx;

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

+2 −0
Original line number Diff line number Diff line
@@ -745,7 +745,9 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
	case VIDIOC_MSM_ISP_REQUEST_BUF:

	case VIDIOC_MSM_ISP_ENQUEUE_BUF:

	case VIDIOC_MSM_ISP_RELEASE_BUF: {

		mutex_lock(&vfe_dev->buf_mgr_mutex);

		rc = msm_isp_proc_buf_cmd(vfe_dev->buf_mgr, cmd, arg);

		mutex_unlock(&vfe_dev->buf_mgr_mutex);

		break;

	}

	case VIDIOC_MSM_ISP_REQUEST_STREAM: