evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: Change CID array size to MAX_CID_CH_PARAM_ENTRY"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-10 22:49:33 -08:00 • committed by Gerrit - the friendly Code Review server
commit e0181c29c3
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
View file

@ -840,7 +840,7 @@ static uint16_t msm_ispif_get_cids_mask_from_cfg(
uint16_t cids_mask = 0; uint16_t cids_mask = 0;
BUG_ON(!entry); BUG_ON(!entry);
for (i = 0; i < entry->num_cids; i++) for (i = 0; i < entry->num_cids && i < MAX_CID_CH_PARAM_ENTRY; i++)
cids_mask |= (1 << entry->cids[i]); cids_mask |= (1 << entry->cids[i]);
return cids_mask; return cids_mask;
@ -970,7 +970,7 @@ static void msm_ispif_intf_cmd(struct ispif_device *ispif, uint32_t cmd_bits,
pr_err("%s: invalid interface type\n", __func__); pr_err("%s: invalid interface type\n", __func__);
return; return;
} }
if (params->entries[i].num_cids > MAX_CID_CH) { if (params->entries[i].num_cids > MAX_CID_CH_PARAM_ENTRY) {
pr_err("%s: out of range of cid_num %d\n", pr_err("%s: out of range of cid_num %d\n",
__func__, params->entries[i].num_cids); __func__, params->entries[i].num_cids);
return; return;

3
include/uapi/media/msmb_ispif.h
View file

@ -28,6 +28,7 @@ enum msm_ispif_intftype {
}; };
#define MAX_PARAM_ENTRIES (INTF_MAX * 2) #define MAX_PARAM_ENTRIES (INTF_MAX * 2)
#define MAX_CID_CH 8 #define MAX_CID_CH 8
#define MAX_CID_CH_PARAM_ENTRY 3
#define PIX0_MASK (1 << PIX0) #define PIX0_MASK (1 << PIX0)
#define PIX1_MASK (1 << PIX1) #define PIX1_MASK (1 << PIX1)
@ -94,7 +95,7 @@ struct msm_ispif_params_entry {
enum msm_ispif_vfe_intf vfe_intf; enum msm_ispif_vfe_intf vfe_intf;
enum msm_ispif_intftype intftype; enum msm_ispif_intftype intftype;
int num_cids; int num_cids;
enum msm_ispif_cid cids[3]; enum msm_ispif_cid cids[MAX_CID_CH_PARAM_ENTRY];
enum msm_ispif_csid csid; enum msm_ispif_csid csid;
int crop_enable; int crop_enable;
uint16_t crop_start_pixel; uint16_t crop_start_pixel;