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

Commit 649e8188 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 NV24 and NV12 pix format"

parents c0f2bc44 4e3412b2

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

+1 −0
Original line number Diff line number Diff line
@@ -1374,6 +1374,7 @@ static void msm_vfe40_axi_cfg_wm_xbar_reg( 
			case V4L2_PIX_FMT_NV12:

			case V4L2_PIX_FMT_NV14:

			case V4L2_PIX_FMT_NV16:

			case V4L2_PIX_FMT_NV24:

				xbar_cfg |= 0x3 << 4; /*PAIR_STREAM_SWAP_CTRL*/

				break;

			}

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

+1 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,7 @@ static void msm_vfe44_axi_cfg_wm_xbar_reg( 
			case V4L2_PIX_FMT_NV12:

			case V4L2_PIX_FMT_NV14:

			case V4L2_PIX_FMT_NV16:

			case V4L2_PIX_FMT_NV24:

				xbar_cfg |= 0x3 << 4; /*PAIR_STREAM_SWAP_CTRL*/

				break;

			}

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

+1 −0
Original line number Diff line number Diff line
@@ -1215,6 +1215,7 @@ static void msm_vfe46_axi_cfg_wm_xbar_reg( 
			case V4L2_PIX_FMT_NV12:

			case V4L2_PIX_FMT_NV14:

			case V4L2_PIX_FMT_NV16:

			case V4L2_PIX_FMT_NV24:

				/* PAIR_STREAM_SWAP_CTRL */

				xbar_cfg |= 0x3 << 4;

				break;

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

+1 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,7 @@ static void msm_vfe47_axi_cfg_wm_xbar_reg( 
			case V4L2_PIX_FMT_NV12:

			case V4L2_PIX_FMT_NV14:

			case V4L2_PIX_FMT_NV16:

			case V4L2_PIX_FMT_NV24:

				/* PAIR_STREAM_SWAP_CTRL */

				xbar_cfg |= 0x3 << 4;

				break;

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

+11 −1
Original line number Diff line number Diff line
@@ -141,10 +141,18 @@ int msm_isp_validate_axi_request(struct msm_vfe_axi_shared_data *axi_data, 
	case V4L2_PIX_FMT_NV21:

	case V4L2_PIX_FMT_NV14:

	case V4L2_PIX_FMT_NV41:

		stream_info->num_planes = 2;

		stream_info->format_factor = 1.5 * ISP_Q2;

		break;

	case V4L2_PIX_FMT_NV16:

	case V4L2_PIX_FMT_NV61:

		stream_info->num_planes = 2;

		stream_info->format_factor = 1.5 * ISP_Q2;

		stream_info->format_factor = 2 * ISP_Q2;

		break;

	case V4L2_PIX_FMT_NV24:

	case V4L2_PIX_FMT_NV42:

		stream_info->num_planes = 2;

		stream_info->format_factor = 3 * ISP_Q2;

		break;

	/*TD: Add more image format*/

	default:
@@ -272,6 +280,8 @@ static uint32_t msm_isp_axi_get_plane_size( 
		break;

	case V4L2_PIX_FMT_NV16:

	case V4L2_PIX_FMT_NV61:

	case V4L2_PIX_FMT_NV24:

	case V4L2_PIX_FMT_NV42:

		size = plane_cfg[plane_idx].output_height *

			plane_cfg[plane_idx].output_width;

		break;