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

Commit 8ff2f9d4 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: Add support for DPCM modes"

parents 92a6537a 60a4b1e8

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

+16 −0
Original line number Diff line number Diff line
@@ -146,6 +146,14 @@ int msm_isp_validate_axi_request(struct msm_vfe_axi_shared_data *axi_data, 
	case V4L2_PIX_FMT_SGBRG10:

	case V4L2_PIX_FMT_SGRBG10:

	case V4L2_PIX_FMT_SRGGB10:

	case V4L2_PIX_FMT_SBGGR10DPCM6:

	case V4L2_PIX_FMT_SGBRG10DPCM6:

	case V4L2_PIX_FMT_SGRBG10DPCM6:

	case V4L2_PIX_FMT_SRGGB10DPCM6:

	case V4L2_PIX_FMT_SBGGR10DPCM8:

	case V4L2_PIX_FMT_SGBRG10DPCM8:

	case V4L2_PIX_FMT_SGRBG10DPCM8:

	case V4L2_PIX_FMT_SRGGB10DPCM8:

	case V4L2_PIX_FMT_SBGGR12:

	case V4L2_PIX_FMT_SGBRG12:

	case V4L2_PIX_FMT_SGRBG12:
@@ -272,6 +280,14 @@ static uint32_t msm_isp_axi_get_plane_size( 
	case V4L2_PIX_FMT_SGBRG10:

	case V4L2_PIX_FMT_SGRBG10:

	case V4L2_PIX_FMT_SRGGB10:

	case V4L2_PIX_FMT_SBGGR10DPCM6:

	case V4L2_PIX_FMT_SGBRG10DPCM6:

	case V4L2_PIX_FMT_SGRBG10DPCM6:

	case V4L2_PIX_FMT_SRGGB10DPCM6:

	case V4L2_PIX_FMT_SBGGR10DPCM8:

	case V4L2_PIX_FMT_SGBRG10DPCM8:

	case V4L2_PIX_FMT_SGRBG10DPCM8:

	case V4L2_PIX_FMT_SRGGB10DPCM8:

	case V4L2_PIX_FMT_QBGGR10:

	case V4L2_PIX_FMT_QGBRG10:

	case V4L2_PIX_FMT_QGRBG10:

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

+24 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,14 @@ int msm_isp_cal_word_per_line(uint32_t output_format, 
	case V4L2_PIX_FMT_SGRBG10:

	case V4L2_PIX_FMT_SRGGB10:

	case V4L2_PIX_FMT_Y10:

	case V4L2_PIX_FMT_SBGGR10DPCM6:

	case V4L2_PIX_FMT_SGBRG10DPCM6:

	case V4L2_PIX_FMT_SGRBG10DPCM6:

	case V4L2_PIX_FMT_SRGGB10DPCM6:

	case V4L2_PIX_FMT_SBGGR10DPCM8:

	case V4L2_PIX_FMT_SGBRG10DPCM8:

	case V4L2_PIX_FMT_SGRBG10DPCM8:

	case V4L2_PIX_FMT_SRGGB10DPCM8:

		val = CAL_WORD(pixel_per_line, 5, 32);

		break;

	case V4L2_PIX_FMT_SBGGR12:
@@ -1683,6 +1691,14 @@ enum msm_isp_pack_fmt msm_isp_get_pack_format(uint32_t output_format) 
	case V4L2_PIX_FMT_SGBRG10:

	case V4L2_PIX_FMT_SGRBG10:

	case V4L2_PIX_FMT_SRGGB10:

	case V4L2_PIX_FMT_SBGGR10DPCM6:

	case V4L2_PIX_FMT_SGBRG10DPCM6:

	case V4L2_PIX_FMT_SGRBG10DPCM6:

	case V4L2_PIX_FMT_SRGGB10DPCM6:

	case V4L2_PIX_FMT_SBGGR10DPCM8:

	case V4L2_PIX_FMT_SGBRG10DPCM8:

	case V4L2_PIX_FMT_SGRBG10DPCM8:

	case V4L2_PIX_FMT_SRGGB10DPCM8:

	case V4L2_PIX_FMT_SBGGR12:

	case V4L2_PIX_FMT_SGBRG12:

	case V4L2_PIX_FMT_SGRBG12:
@@ -1770,6 +1786,14 @@ int msm_isp_get_bit_per_pixel(uint32_t output_format) 
	case V4L2_PIX_FMT_SGBRG10:

	case V4L2_PIX_FMT_SGRBG10:

	case V4L2_PIX_FMT_SRGGB10:

	case V4L2_PIX_FMT_SBGGR10DPCM6:

	case V4L2_PIX_FMT_SGBRG10DPCM6:

	case V4L2_PIX_FMT_SGRBG10DPCM6:

	case V4L2_PIX_FMT_SRGGB10DPCM6:

	case V4L2_PIX_FMT_SBGGR10DPCM8:

	case V4L2_PIX_FMT_SGBRG10DPCM8:

	case V4L2_PIX_FMT_SGRBG10DPCM8:

	case V4L2_PIX_FMT_SRGGB10DPCM8:

	case V4L2_PIX_FMT_QBGGR10:

	case V4L2_PIX_FMT_QGBRG10:

	case V4L2_PIX_FMT_QGRBG10:

include/uapi/linux/videodev2.h

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 *  Video for Linux Two header file

 *

 *  Copyright (C) 1999-2012 the contributors

 *  Copyright (c) 2016, The Linux Foundation. All rights reserved.

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
@@ -410,6 +411,12 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_SGBRG10DPCM8 v4l2_fourcc('b', 'G', 'A', '8')

#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')

#define V4L2_PIX_FMT_SRGGB10DPCM8 v4l2_fourcc('b', 'R', 'A', '8')

	/* 10bit raw bayer DPCM compressed to 6 bits */

#define V4L2_PIX_FMT_SBGGR10DPCM6 v4l2_fourcc('b', 'B', 'A', '6')

#define V4L2_PIX_FMT_SGBRG10DPCM6 v4l2_fourcc('b', 'G', 'A', '6')

#define V4L2_PIX_FMT_SGRBG10DPCM6 v4l2_fourcc('B', 'D', '1', '6')

#define V4L2_PIX_FMT_SRGGB10DPCM6 v4l2_fourcc('b', 'R', 'A', '6')



	/*

	 * 10bit raw bayer, expanded to 16 bits

	 * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...

include/uapi/media/msm_camsensor_sdk.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define CSI_DECODE_8BIT         1

#define CSI_DECODE_10BIT        2

#define CSI_DECODE_12BIT        3

#define CSI_DECODE_DPCM_10_6_10 4

#define CSI_DECODE_DPCM_10_8_10 5

#define MAX_CID                 16

#define I2C_SEQ_REG_DATA_MAX    1024