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

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

Merge "mm-camera2:isp2: Add support for 12bit-plain16 raw format"

parents 8cf945f5 ae18a5e3

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

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, 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 version 2 and
@@ -1218,6 +1218,10 @@ static void msm_vfe40_cfg_fetch_engine(struct vfe_device *vfe_dev, 
	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_P16BGGR12:

	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

		main_unpack_pattern = 0xB210;

		break;

	default:

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

+9 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, 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 version 2 and
@@ -183,6 +183,10 @@ int msm_isp_validate_axi_request(struct msm_vfe_axi_shared_data *axi_data, 
	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_P16BGGR12:

	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

	case V4L2_PIX_FMT_JPEG:

	case V4L2_PIX_FMT_META:

	case V4L2_PIX_FMT_META10:
@@ -326,6 +330,10 @@ static uint32_t msm_isp_axi_get_plane_size( 
	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_P16BGGR12:

	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

		size = plane_cfg[plane_idx].output_height *

		plane_cfg[plane_idx].output_width;

		break;

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

+13 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2018, 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 version 2 and
@@ -1601,6 +1601,10 @@ int msm_isp_cal_word_per_line(uint32_t output_format, 
	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_P16BGGR12:

	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

		val = CAL_WORD(pixel_per_line, 1, 4);

	break;

	case V4L2_PIX_FMT_NV24:
@@ -1667,6 +1671,10 @@ enum msm_isp_pack_fmt msm_isp_get_pack_format(uint32_t output_format) 
	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_P16BGGR12:

	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

		return PLAIN16;

	default:

		msm_isp_print_fourcc_error(__func__, output_format);
@@ -1751,6 +1759,10 @@ int msm_isp_get_bit_per_pixel(uint32_t output_format) 
	case V4L2_PIX_FMT_QGRBG12:

	case V4L2_PIX_FMT_QRGGB12:

	case V4L2_PIX_FMT_Y12:

	case V4L2_PIX_FMT_P16BGGR12:

	case V4L2_PIX_FMT_P16GBRG12:

	case V4L2_PIX_FMT_P16GRBG12:

	case V4L2_PIX_FMT_P16RGGB12:

		return 12;

	case V4L2_PIX_FMT_SBGGR14:

	case V4L2_PIX_FMT_SGBRG14:

include/uapi/media/msmb_isp.h

+4 −0
Original line number Diff line number Diff line
@@ -917,6 +917,10 @@ struct msm_isp_ahb_clk_cfg { 
#define V4L2_PIX_FMT_P16GBRG10 v4l2_fourcc('P', 'G', 'B', '0')

#define V4L2_PIX_FMT_P16GRBG10 v4l2_fourcc('P', 'G', 'R', '0')

#define V4L2_PIX_FMT_P16RGGB10 v4l2_fourcc('P', 'R', 'G', '0')

#define V4L2_PIX_FMT_P16BGGR12 v4l2_fourcc('P', 'B', 'G', '2')

#define V4L2_PIX_FMT_P16GBRG12 v4l2_fourcc('P', 'G', 'B', '2')

#define V4L2_PIX_FMT_P16GRBG12 v4l2_fourcc('P', 'G', 'R', '2')

#define V4L2_PIX_FMT_P16RGGB12 v4l2_fourcc('P', 'R', 'G', '2')

#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')