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

Commit ee5579b1 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: Add Grey scale format."

parents 0b7be593 011917a5

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

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,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_GREY:

		stream_info->num_planes = 1;

		stream_info->format_factor = ISP_Q2;

		break;
@@ -208,6 +209,7 @@ static uint32_t msm_isp_axi_get_plane_size( 
	case V4L2_PIX_FMT_QRGGB8:

	case V4L2_PIX_FMT_JPEG:

	case V4L2_PIX_FMT_META:

	case V4L2_PIX_FMT_GREY:

		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

+1 −0
Original line number Diff line number Diff line
@@ -1315,6 +1315,7 @@ int msm_isp_cal_word_per_line(uint32_t output_format, 
	case V4L2_PIX_FMT_QRGGB8:

	case V4L2_PIX_FMT_JPEG:

	case V4L2_PIX_FMT_META:

	case V4L2_PIX_FMT_GREY:

		val = CAL_WORD(pixel_per_line, 1, 8);

		break;

	case V4L2_PIX_FMT_SBGGR10: