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

Commit e11d1e4f 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: sensor: Add META10 fourcc"

parents 6b24dd5a 997a3364

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

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ int msm_isp_validate_axi_request(struct msm_vfe_axi_shared_data *axi_data, 
	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_JPEG:

	case V4L2_PIX_FMT_META:

	case V4L2_PIX_FMT_META10:

	case V4L2_PIX_FMT_GREY:

	case V4L2_PIX_FMT_Y10:

	case V4L2_PIX_FMT_Y12:
@@ -292,6 +293,7 @@ static uint32_t msm_isp_axi_get_plane_size( 
	case V4L2_PIX_FMT_QGBRG10:

	case V4L2_PIX_FMT_QGRBG10:

	case V4L2_PIX_FMT_QRGGB10:

	case V4L2_PIX_FMT_META10:

		/* TODO: fix me */

		size = plane_cfg[plane_idx].output_height *

		plane_cfg[plane_idx].output_width;

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

+3 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,7 @@ int msm_isp_cal_word_per_line(uint32_t output_format, 
	case V4L2_PIX_FMT_SGBRG10DPCM8:

	case V4L2_PIX_FMT_SGRBG10DPCM8:

	case V4L2_PIX_FMT_SRGGB10DPCM8:

	case V4L2_PIX_FMT_META10:

		val = CAL_WORD(pixel_per_line, 5, 32);

		break;

	case V4L2_PIX_FMT_SBGGR12:
@@ -1584,6 +1585,8 @@ int msm_isp_get_bit_per_pixel(uint32_t output_format) 
	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_META10:

	case MSM_V4L2_PIX_FMT_META10:

		return 10;

	case V4L2_PIX_FMT_SBGGR12:

	case V4L2_PIX_FMT_SGBRG12:

include/uapi/media/msm_cam_sensor.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define MAX_REGULATOR 5



#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_SBGGR14 v4l2_fourcc('B', 'G', '1', '4')

	/* 14  BGBG.. GRGR.. */

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

include/uapi/media/msmb_isp.h

+1 −0
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ struct msm_isp_ahb_clk_cfg { 
#define V4L2_PIX_FMT_NV14 v4l2_fourcc('N', 'V', '1', '4')

#define V4L2_PIX_FMT_NV41 v4l2_fourcc('N', 'V', '4', '1')

#define V4L2_PIX_FMT_META v4l2_fourcc('Q', 'M', 'E', 'T')

#define V4L2_PIX_FMT_META10 v4l2_fourcc('Q', 'M', '1', '0')

#define V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14 BGBG.GRGR.*/

#define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14 GBGB.RGRG.*/

#define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('B', 'A', '1', '4') /* 14 GRGR.BGBG.*/