mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 10:59:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: get rid of #ifdef ISP_VEC_NELEMS

Browse Source 
This is defined as 64 for the devices/firmware that were chosen.

So, evaluate the macros accordingly.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab
2021-11-16 11:16:54 +00:00
parent 912680064f
commit 5b49e068be
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h
View File

@@ -36,17 +36,7 @@ more details.
#define BITS8_ELEMENTS_PER_XMEM_ADDR CEIL_DIV(XMEM_WIDTH_BITS, 8)
#define BITS16_ELEMENTS_PER_XMEM_ADDR CEIL_DIV(XMEM_WIDTH_BITS, 16)
#if ISP_VEC_NELEMS == 64
#define ISP_NWAY_LOG2 6
#elif ISP_VEC_NELEMS == 32
#define ISP_NWAY_LOG2 5
#elif ISP_VEC_NELEMS == 16
#define ISP_NWAY_LOG2 4
#elif ISP_VEC_NELEMS == 8
#define ISP_NWAY_LOG2 3
#else
#error "isp_const.h ISP_VEC_NELEMS must be one of {8, 16, 32, 64}"
#endif
/* *****************************
* ISP input/output buffer sizes

10
drivers/staging/media/atomisp/pci/sh_css_defs.h
View File

@@ -117,13 +117,8 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191]
#define SH_CSS_NUM_INPUT_BUF_LINES 4
/* Left cropping only applicable for sufficiently large nway */
#if ISP_VEC_NELEMS == 16
#define SH_CSS_MAX_LEFT_CROPPING 0
#define SH_CSS_MAX_TOP_CROPPING 0
#else
#define SH_CSS_MAX_LEFT_CROPPING 12
#define SH_CSS_MAX_TOP_CROPPING 12
#endif
#define SH_CSS_SP_MAX_WIDTH 1280
@@ -137,13 +132,8 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191]
#define SH_CSS_MIN_DVS_ENVELOPE 12U
/* The FPGA system (vec_nelems == 16) only supports upto 5MP */
#if ISP_VEC_NELEMS == 16
#define SH_CSS_MAX_SENSOR_WIDTH 2560
#define SH_CSS_MAX_SENSOR_HEIGHT 1920
#else
#define SH_CSS_MAX_SENSOR_WIDTH 4608
#define SH_CSS_MAX_SENSOR_HEIGHT 3450
#endif
/* Limited to reduce vmem pressure */
#if ISP_VMEM_DEPTH >= 3072