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

Commit 2b2fa705 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Add RAW12 support for meta data"

parents 5d5286b3 d9c8fa2e

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

+5 −0
Original line number Diff line number Diff line
@@ -905,7 +905,9 @@ 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;
@@ -1022,7 +1024,9 @@ 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;
@@ -1802,6 +1806,7 @@ int msm_isp_get_bit_per_pixel(uint32_t output_format) 
	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

	case MSM_V4L2_PIX_FMT_META12:

		return 12;

	case V4L2_PIX_FMT_SBGGR14:

	case V4L2_PIX_FMT_SGBRG14:

include/uapi/media/msm_cam_sensor.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 


#define MSM_V4L2_PIX_FMT_META v4l2_fourcc('M', 'E', 'T', 'A') /* META */

#define MSM_V4L2_PIX_FMT_META10 v4l2_fourcc('M', 'E', '1', '0') /* META10 */

#define MSM_V4L2_PIX_FMT_META12 v4l2_fourcc('M', 'E', '1', '2') /* META12 */



#define MSM_V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4')

	/* 14  BGBG.. GRGR.. */

#define MSM_V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4')