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

Commit 9ec2328c 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: Change MAX_CID_CH macro to 3"

parents 3803e4f8 67cf0444

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+2 −2
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ static uint16_t msm_ispif_get_cids_mask_from_cfg( 
	uint16_t cids_mask = 0;

	BUG_ON(!entry);



	for (i = 0; i < entry->num_cids; i++)

	for (i = 0; i < entry->num_cids && i < MAX_CID_CH_v2; i++)

		cids_mask |= (1 << entry->cids[i]);



	return cids_mask;
@@ -967,7 +967,7 @@ static void msm_ispif_intf_cmd(struct ispif_device *ispif, uint32_t cmd_bits, 
			pr_err("%s: invalid interface type\n", __func__);

			return;

		}

		if (params->entries[i].num_cids > MAX_CID_CH) {

		if (params->entries[i].num_cids > MAX_CID_CH_v2) {

			pr_err("%s: out of range of cid_num %d\n",

				__func__, params->entries[i].num_cids);

			return;

include/uapi/media/msmb_ispif.h

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ enum msm_ispif_intftype { 
};

#define MAX_PARAM_ENTRIES (INTF_MAX * 2)

#define MAX_CID_CH	8

#define MAX_CID_CH_v2	3



#define PIX0_MASK (1 << PIX0)

#define PIX1_MASK (1 << PIX1)
@@ -94,7 +95,7 @@ struct msm_ispif_params_entry { 
	enum msm_ispif_vfe_intf vfe_intf;

	enum msm_ispif_intftype intftype;

	int num_cids;

	enum msm_ispif_cid cids[3];

	enum msm_ispif_cid cids[MAX_CID_CH_v2];

	enum msm_ispif_csid csid;

	int crop_enable;

	uint16_t crop_start_pixel;