Commit 5b49e068 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: get rid of #ifdef ISP_VEC_NELEMS

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

So, evaluate the macros accordingly.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 91268006
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment