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

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

Merge "msm: isp: Adds support for PLAIN Raw format"

parents 73a3be49 c83ae864

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

+11 −0
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ int msm_isp_validate_axi_request(struct msm_vfe_axi_shared_data *axi_data, 
	case V4L2_PIX_FMT_QGBRG14:

	case V4L2_PIX_FMT_QGRBG14:

	case V4L2_PIX_FMT_QRGGB14:

	case V4L2_PIX_FMT_P16BGGR10:

	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

	case V4L2_PIX_FMT_JPEG:

	case V4L2_PIX_FMT_META:

		stream_info->num_planes = 1;
@@ -236,6 +240,13 @@ static uint32_t msm_isp_axi_get_plane_size( 
		size = plane_cfg[plane_idx].output_height *

		plane_cfg[plane_idx].output_width;

		break;

	case V4L2_PIX_FMT_P16BGGR10:

	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

		size = plane_cfg[plane_idx].output_height *

		plane_cfg[plane_idx].output_width;

		break;

	case V4L2_PIX_FMT_NV12:

	case V4L2_PIX_FMT_NV21:

		if (plane_cfg[plane_idx].output_plane_format == Y_PLANE)

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

+15 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,12 @@ int msm_isp_cal_word_per_line(uint32_t output_format, 
	case V4L2_PIX_FMT_UYVY:

	case V4L2_PIX_FMT_VYUY:

		val = CAL_WORD(pixel_per_line, 2, 8);

	break;

	case V4L2_PIX_FMT_P16BGGR10:

	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

		val = CAL_WORD(pixel_per_line, 1, 4);

	break;

		/*TD: Add more image format*/

	default:
@@ -1281,6 +1287,11 @@ enum msm_isp_pack_fmt msm_isp_get_pack_format(uint32_t output_format) 
	case V4L2_PIX_FMT_QGRBG14:

	case V4L2_PIX_FMT_QRGGB14:

		return QCOM;

	case V4L2_PIX_FMT_P16BGGR10:

	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

		return PLAIN16;

	default:

		msm_isp_print_fourcc_error(__func__, output_format);

		break;
@@ -1340,6 +1351,10 @@ int msm_isp_get_bit_per_pixel(uint32_t output_format) 
	case V4L2_PIX_FMT_QRGGB10:

	case V4L2_PIX_FMT_Y10:

	case V4L2_PIX_FMT_Y10BPACK:

	case V4L2_PIX_FMT_P16BGGR10:

	case V4L2_PIX_FMT_P16GBRG10:

	case V4L2_PIX_FMT_P16GRBG10:

	case V4L2_PIX_FMT_P16RGGB10:

		return 10;

	case V4L2_PIX_FMT_SBGGR12:

	case V4L2_PIX_FMT_SGBRG12:

include/media/msmb_isp.h

+4 −0
Original line number Diff line number Diff line
@@ -493,6 +493,10 @@ struct msm_isp_event_data { 
#define V4L2_PIX_FMT_QGBRG14 v4l2_fourcc('Q', 'G', 'B', '4')

#define V4L2_PIX_FMT_QGRBG14 v4l2_fourcc('Q', 'G', 'R', '4')

#define V4L2_PIX_FMT_QRGGB14 v4l2_fourcc('Q', 'R', 'G', '4')

#define V4L2_PIX_FMT_P16BGGR10 v4l2_fourcc('P', 'B', 'G', '0')

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