media: atomisp: replace math macros
Subsystems (4)
v2 cover media: atomisp: replace math macros
Kill unused definitions that may use custom macros from math_support.h and reduce usage of the latter and even kill some of them at the end of the series.
Please, apply only after tests that confirm everything is working as expected.
Changelog v2:
- added a cleanup patch 1
- removed potential div-by-0 conversions
v1:
https://lore.kernel.org/linux-media/[email protected]/
Andy Shevchenko (3):
media: atomisp: Remove unused header
media: atomisp: Replace macros from math_support.h
media: atomisp: Remove no more used macros from math_support.h
.../pci/hive_isp_css_include/math_support.h | 5 - .../kernels/anr/anr_1.0/ia_css_anr_types.h | 4 +- .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 6 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 4 +- .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 22 +-- .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 6 +- .../isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 2 +- .../pci/isp/modes/interface/input_buf.isp.h | 6 +- .../pci/isp/modes/interface/isp_const.h | 157 ------------------ .../pci/runtime/debug/src/ia_css_debug.c | 1 - .../atomisp/pci/runtime/frame/src/frame.c | 29 ++-- .../atomisp/pci/runtime/ifmtr/src/ifmtr.c | 11 +- .../pci/runtime/isys/src/virtual_isys.c | 2 +- .../staging/media/atomisp/pci/sh_css_defs.h | 12 +- .../media/atomisp/pci/sh_css_internal.h | 8 +- .../media/atomisp/pci/sh_css_param_dvs.h | 22 +-- .../staging/media/atomisp/pci/sh_css_params.c | 12 +- 17 files changed, 77 insertions(+), 232 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h
Signature · 1 line
2.47.2
PATCH v2 1/3 media: atomisp: Remove unused header
There are some unused definitions that are using macros from math_support.h. In order to have a cleaner future changes, remove them first.
--- .../pci/isp/modes/interface/input_buf.isp.h | 1 - .../pci/isp/modes/interface/isp_const.h | 157 ------------------ .../media/atomisp/pci/sh_css_param_dvs.h | 3 - 3 files changed, 161 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h
drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h +0 -1
@@ -10,7 +10,6 @@ Copyright (c) 2010 - 2015, Intel Corporation./* Temporary include, since IA_CSS_BINARY_MODE_COPY is still needed */ #include "sh_css_defs.h" -#include "isp_const.h" /* MAX_VECTORS_PER_INPUT_LINE */ #define INPUT_BUF_HEIGHT 2/* double buffer */ #define INPUT_BUF_LINES 2
drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h deleted +0 -157
157 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_param_dvs.h +0 -3
@@ -33,9 +33,6 @@#define DVS_TABLE_IN_BLOCKDIM_Y_LUMA (X ) (DVS_NUM_BLOCKS_Y(X) + 1)#define DVS_TABLE_IN_BLOCKDIM_Y_CHROMA (X ) (DVS_NUM_BLOCKS_Y_CHROMA(X) + 1) -#define DVS_ENVELOPE_X (X ) (((X) == 0) ? (DVS_ENV_MIN_X) : (X)) -#define DVS_ENVELOPE_Y (X ) (((X) == 0) ? (DVS_ENV_MIN_Y) : (X)) -#define DVS_COORD_FRAC_BITS (10)/* ISP2400 */
Signature · 1 line
2.47.2
PATCH v2 2/3 media: atomisp: Replace macros from math_support.h
In reply to Andy ShevchenkoReplace rarely used macros by generic ones from Linux kernel headers.
--- .../kernels/anr/anr_1.0/ia_css_anr_types.h | 4 ++- .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 6 ++-- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 4 +-- .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 22 +++++++------- .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 6 ++-- .../isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 2 +- .../pci/isp/modes/interface/input_buf.isp.h | 5 +++- .../pci/runtime/debug/src/ia_css_debug.c | 1 - .../atomisp/pci/runtime/frame/src/frame.c | 29 ++++++++++--------- .../atomisp/pci/runtime/ifmtr/src/ifmtr.c | 11 ++++--- .../pci/runtime/isys/src/virtual_isys.c | 2 +- .../staging/media/atomisp/pci/sh_css_defs.h | 12 ++++---- .../media/atomisp/pci/sh_css_internal.h | 8 ++--- .../media/atomisp/pci/sh_css_param_dvs.h | 19 +++++++----- .../staging/media/atomisp/pci/sh_css_params.c | 12 ++++---- 15 files changed, 77 insertions(+), 66 deletions(-)
drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h +3 -1
@@ -11,9 +11,11 @@* CSS-API header file for Advanced Noise Reduction kernel v1 */ +#include <linux/math.h> +/* Application specific DMA settings */ #define ANR_BPP 10 -#define ANR_ELEMENT_BITS ((CEIL_DIV(ANR_BPP, 8)) * 8) +#define ANR_ELEMENT_BITS round_up(ANR_BPP, 8)/* Advanced Noise Reduction configuration. * This is also known as Low-Light.
drivers/staging/media/atomisp/pci/isp/kernels/dpc2/ia_css_dpc2_param.h +4 -2
@@ -7,6 +7,8 @@#ifndef __IA_CSS_DPC2_PARAM_H#define __IA_CSS_DPC2_PARAM_H +#include <linux/math.h> +#include "type_support.h" #include "vmem.h" /* for VMEM_ARRAY*/
@@ -19,12 +21,12 @@/* 3 lines state per color plane input_line_state */ #define DPC2_STATE_INPUT_BUFFER_HEIGHT (3 * NUM_PLANES)/* Each plane has width equal to half frame line */ -#define DPC2_STATE_INPUT_BUFFER_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define DPC2_STATE_INPUT_BUFFER_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 line state per color plane for local deviation state*/ #define DPC2_STATE_LOCAL_DEVIATION_BUFFER_HEIGHT (1 * NUM_PLANES)/* Each plane has width equal to half frame line */ -#define DPC2_STATE_LOCAL_DEVIATION_BUFFER_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define DPC2_STATE_LOCAL_DEVIATION_BUFFER_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* MINMAX state buffer stores 1 full input line (GR-R color line) */ #define DPC2_STATE_SECOND_MINMAX_BUFFER_HEIGHT 1
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +2 -2
@@ -141,10 +141,10 @@ convert_coords_to_ispparams(/* similar to topleft_y calculation, but round up if ymax * has any fraction bits */ - bottom_y =CEIL_DIV (ymax,1 <<DVS_COORD_FRAC_BITS ); + bottom_y =DIV_ROUND_UP (ymax,BIT (DVS_COORD_FRAC_BITS )); s.in_block_height = bottom_y - topleft_y + dvs_interp_envelope; - bottom_x =CEIL_DIV (xmax,1 <<DVS_COORD_FRAC_BITS ); + bottom_x =DIV_ROUND_UP (xmax,BIT (DVS_COORD_FRAC_BITS )); s.in_block_width = bottom_x - topleft_x + dvs_interp_envelope; topleft_x_frac = topleft_x << (DVS_COORD_FRAC_BITS );
drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h +12 -10
@@ -7,6 +7,8 @@#ifndef __IA_CSS_EED1_8_PARAM_H#define __IA_CSS_EED1_8_PARAM_H +#include <linux/math.h> +#include "type_support.h" #include "vmem.h" /* needed for VMEM_ARRAY */
@@ -35,35 +37,35 @@#define EED1_8_STATE_INPUT_BUFFER_HEIGHT (5 * NUM_PLANES)/* Each plane has width equal to half frame line */ -#define EED1_8_STATE_INPUT_BUFFER_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_INPUT_BUFFER_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 line state per color plane LD_H state */ #define EED1_8_STATE_LD_H_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_LD_H_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_LD_H_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 line state per color plane LD_V state */ #define EED1_8_STATE_LD_V_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_LD_V_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_LD_V_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 line (single plane) state for D_Hr state */ #define EED1_8_STATE_D_HR_HEIGHT 1 -#define EED1_8_STATE_D_HR_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_D_HR_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 line (single plane) state for D_Hb state */ #define EED1_8_STATE_D_HB_HEIGHT 1 -#define EED1_8_STATE_D_HB_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_D_HB_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 2 lines (single plane) state for D_Vr state */ #define EED1_8_STATE_D_VR_HEIGHT 2 -#define EED1_8_STATE_D_VR_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_D_VR_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 2 line (single plane) state for D_Vb state */ #define EED1_8_STATE_D_VB_HEIGHT 2 -#define EED1_8_STATE_D_VB_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_D_VB_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 2 lines state for R and B (= 2 planes) rb_zipped_state */ #define EED1_8_STATE_RB_ZIPPED_HEIGHT (2 * 2) -#define EED1_8_STATE_RB_ZIPPED_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_RB_ZIPPED_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)#if EED1_8_FC_ENABLE_MEDIAN /* 1 full input line (GR-R color line) for Yc state */
@@ -72,11 +74,11 @@/* 1 line state per color plane Cg_state */ #define EED1_8_STATE_CG_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_CG_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_CG_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 line state per color plane Co_state */ #define EED1_8_STATE_CO_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_CO_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) +#define EED1_8_STATE_CO_WIDTH DIV_ROUND_UP(MAX_FRAME_SIMDWIDTH, 2)/* 1 full input line (GR-R color line) for AbsK state */ #define EED1_8_STATE_ABSK_HEIGHT 1
drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c +4 -2
@@ -4,6 +4,8 @@* Copyright (c) 2015, Intel Corporation. */ +#include <linux/math.h> +#include <assert_support.h> #include <ia_css_frame_public.h> #include <ia_css_frame.h>
@@ -71,9 +73,9 @@ int ia_css_fpn_configure(const struct ia_css_binary *binary, &my_info }; - my_info.res.width =CEIL_DIV (info->res.width,2 );/* Packed by 2x */ + my_info.res.width =DIV_ROUND_UP (info->res.width,2 );/* Packed by 2x */ my_info.res.height = info->res.height; - my_info.padded_width =CEIL_DIV (info->padded_width,2 );/* Packed by 2x */ + my_info.padded_width =DIV_ROUND_UP (info->padded_width,2 );/* Packed by 2x */ my_info.format = info->format; my_info.raw_bit_depth =FPN_BITS_PER_PIXEL ; my_info.raw_bayer_order = info->raw_bayer_order;
drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h +1 -1
@@ -22,7 +22,7 @@ struct sh_css_isp_sc_params {* vec_slice is used for 2 adjacent vectors of shading gains. * The number of shift times by vec_slice is 8. * Max grid cell bqs to support the shading table centerting: N = 32 -* CEIL_DIV(N-1, ISP_SLICE_NELEMS) = CEIL_DIV(31, 4) = 8 +* DIV_ROUND_UP(N-1, ISP_SLICE_NELEMS) = DIV_ROUND_UP(31, 4) = 8 */ #define SH_CSS_SC_INTERPED_GAIN_HOR_SLICE_TIMES 8
drivers/staging/media/atomisp/pci/isp/modes/interface/input_buf.isp.h +4 -1
@@ -8,6 +8,8 @@ Copyright (c) 2010 - 2015, Intel Corporation.#ifndef _INPUT_BUF_ISP_H_#define _INPUT_BUF_ISP_H_ +#include <linux/math.h> +/* Temporary include, since IA_CSS_BINARY_MODE_COPY is still needed */ #include "sh_css_defs.h"
@@ -21,7 +23,8 @@ Copyright (c) 2010 - 2015, Intel Corporation./* In continuous mode, the input buffer must be a fixed size for all binaries * and at a fixed address since it will be used by the SP. */ #define EXTRA_INPUT_VECTORS 2/* For left padding */ -#define MAX_VECTORS_PER_INPUT_LINE_CONT (CEIL_DIV(SH_CSS_MAX_SENSOR_WIDTH, ISP_NWAY) + EXTRA_INPUT_VECTORS) +#define MAX_VECTORS_PER_INPUT_LINE_CONT \ + (DIV_ROUND_UP(SH_CSS_MAX_SENSOR_WIDTH, ISP_NWAY) + EXTRA_INPUT_VECTORS)/* The input buffer should be on a fixed address in vmem, for continuous capture */ #define INPUT_BUF_ADDR 0x0
drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +0 -1
@@ -51,7 +51,6 @@#include "sp.h" #include "isp.h" #include "type_support.h" -#include "math_support.h" /* CEIL_DIV */ #include "input_system.h" /* input_formatter_reg_load */ #include "ia_css_tagger_common.h"
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +15 -14
@@ -4,15 +4,16 @@* Copyright (c) 2015, Intel Corporation. */ -#include "hmm.h" +#include <linux/bitops.h> +#include <linux/math.h> -#include "ia_css_frame.h" -#include <math_support.h> #include "assert_support.h" +#include "atomisp_internal.h" +#include "hmm.h" #include "ia_css_debug.h" +#include "ia_css_frame.h" #include "isp.h" #include "sh_css_internal.h" -#include "atomisp_internal.h" #define NV12_TILEY_TILE_WIDTH 128#define NV12_TILEY_TILE_HEIGHT 32
@@ -459,15 +460,16 @@ static void frame_init_single_plane(struct ia_css_frame *frame,unsigned int stride; stride = subpixels_per_line * bytes_per_pixel; -/* Frame height needs to be even number - needed by hw ISYS2401 -In case of odd number, round up to even. -Images won't be impacted by this round up, -only needed by jpeg/embedded data. -As long as buffer allocation and release are using data_bytes, -there won't be memory leak. */ - frame->data_bytes = stride *CEIL_MUL2 (height,2 ); +/* +* Frame height needs to be even number - needed by hw ISYS2401. +* In case of odd number, round up to even. +* Images won't be impacted by this round up, +* only needed by jpeg/embedded data. +* As long as buffer allocation and release are using data_bytes, +* there won't be memory leak. +*/ + frame->data_bytes = stride *round_up (height,2 );frame_init_plane (plane, subpixels_per_line, stride, height,0 ); -return ; } static void frame_init_raw_single_plane(
@@ -486,7 +488,6 @@ static void frame_init_raw_single_plane( HIVE_ISP_DDR_WORD_BITS / bits_per_pixel); frame->data_bytes = stride * height;frame_init_plane (plane, subpixels_per_line, stride, height,0 ); -return ; } static void frame_init_nv_planes(struct ia_css_frame *frame,
@@ -690,7 +691,7 @@ ia_css_elems_bytes_from_info(const struct ia_css_frame_info *info)if (info->format ==IA_CSS_FRAME_FORMAT_RAW || (info->format ==IA_CSS_FRAME_FORMAT_RAW_PACKED )) {if (info->raw_bit_depth) -return CEIL_DIV (info->raw_bit_depth,8 ); +return BITS_TO_BYTES (info->raw_bit_depth);else return 2 ;/* bytes per pixel */ }
drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c +5 -6
@@ -4,9 +4,9 @@* Copyright (c) 2010 - 2015, Intel Corporation. */ -#include "system_global.h" -#include <linux/kernel.h> +#include <linux/math.h> +#include "system_global.h" #include "ia_css_ifmtr.h" #include <math_support.h>
@@ -149,10 +149,9 @@ int ia_css_ifmtr_configure(struct ia_css_stream_config *config, left_padding =2 *ISP_VEC_NELEMS - config->left_padding;if (left_padding) { - num_vectors =CEIL_DIV (cropped_width + left_padding, -ISP_VEC_NELEMS ); + num_vectors =DIV_ROUND_UP (cropped_width + left_padding,ISP_VEC_NELEMS ); }else { - num_vectors =CEIL_DIV (cropped_width,ISP_VEC_NELEMS ); + num_vectors =DIV_ROUND_UP (cropped_width,ISP_VEC_NELEMS ); num_vectors *= buffer_height;/* todo: in case of left padding, num_vectors is vectors per line,
@@ -305,7 +304,7 @@ int ia_css_ifmtr_configure(struct ia_css_stream_config *config,if ((!binary) || config->continuous)/* !binary -> sp raw copy pipe */ buffer_height *=2 ; - vectors_per_line =CEIL_DIV (cropped_width,ISP_VEC_NELEMS ); + vectors_per_line =DIV_ROUND_UP (cropped_width,ISP_VEC_NELEMS ); vectors_per_line =CEIL_MUL (vectors_per_line, deinterleaving);break ;case ATOMISP_INPUT_FORMAT_RAW_14 :
drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c +1 -1
@@ -808,7 +808,7 @@ static bool calculate_isys2401_dma_port_cfg( cfg->elements =HIVE_ISP_DDR_WORD_BITS / bits_per_pixel; cfg->cropping =0 ; - cfg->width =CEIL_DIV (cfg->stride,HIVE_ISP_DDR_WORD_BYTES ); + cfg->width =DIV_ROUND_UP (cfg->stride,HIVE_ISP_DDR_WORD_BYTES );return true; }
drivers/staging/media/atomisp/pci/sh_css_defs.h +6 -6
@@ -7,12 +7,12 @@#ifndef _SH_CSS_DEFS_H_#define _SH_CSS_DEFS_H_ +#include <linux/math.h> +#include "isp.h" /*#include "vamem.h"*/ /* Cannot include for VAMEM properties this file is visible on ISP -> pipeline generator */ -#include "math_support.h" /* max(), min, etc etc */ -/* ID's for refcount */ #define IA_CSS_REFCOUNT_PARAM_SET_POOL 0xCAFE0001#define IA_CSS_REFCOUNT_PARAM_BUFFER 0xCAFE0002
@@ -182,7 +182,7 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191]The ISP firmware needs these rules to be applied at pre-processor time, that's why these are macros, not functions. */ #define _ISP_BQS (num) ((num) / 2) -#define _ISP_VECS (width) CEIL_DIV(width, ISP_VEC_NELEMS) +#define _ISP_VECS (width) DIV_ROUND_UP(width, ISP_VEC_NELEMS)#define ISP_BQ_GRID_WIDTH (elements_per_line, deci_factor_log2) \ CEIL_SHIFT(elements_per_line / 2, deci_factor_log2)
@@ -194,9 +194,9 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191]/* The morphing table is similar to the shading table in the sense that we have 1 more value than we have cells in the grid. */ #define _ISP_MORPH_TABLE_WIDTH (int_width) \ - (CEIL_DIV(int_width, SH_CSS_MORPH_TABLE_GRID) + 1) + (DIV_ROUND_UP(int_width, SH_CSS_MORPH_TABLE_GRID) + 1)#define _ISP_MORPH_TABLE_HEIGHT (int_height) \ - (CEIL_DIV(int_height, SH_CSS_MORPH_TABLE_GRID) + 1) + (DIV_ROUND_UP(int_height, SH_CSS_MORPH_TABLE_GRID) + 1)#define _ISP_MORPH_TABLE_ALIGNED_WIDTH (width) \ CEIL_MUL(_ISP_MORPH_TABLE_WIDTH(width), \ SH_CSS_MORPH_TABLE_ELEMS_PER_DDR_WORD)
@@ -298,7 +298,7 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191] c_subsampling, \ num_chunks, \ pipelining) \ - CEIL_MUL2(CEIL_MUL2(MAX(__ISP_PADDED_OUTPUT_WIDTH(out_width, \ + round_up(round_up(MAX(__ISP_PADDED_OUTPUT_WIDTH(out_width, \ dvs_env_width, \ left_crop), \ __ISP_MIN_INTERNAL_WIDTH(num_chunks, \
drivers/staging/media/atomisp/pci/sh_css_internal.h +3 -5
@@ -8,6 +8,7 @@#define _SH_CSS_INTERNAL_H_#include <linux/build_bug.h> +#include <linux/math.h> #include <linux/stdarg.h> #include <system_global.h>
@@ -95,7 +96,6 @@* the SIZE_OF_XXX macro of the corresponding struct. If they are not * equal, functionality will break. */ -#define CALC_ALIGNMENT_MEMBER (x, y) (CEIL_MUL(x, y) - x)#define SIZE_OF_HRT_VADDRESS sizeof(hive_uint32)/* Number of SP's */
@@ -704,13 +704,11 @@ struct sh_css_hmm_buffer {/* Do not use sizeof(uint64_t) since that does not exist of SP */ #define SIZE_OF_SH_CSS_HMM_BUFFER_STRUCT \ - (SIZE_OF_PAYLOAD_UNION + \ - CALC_ALIGNMENT_MEMBER(SIZE_OF_PAYLOAD_UNION, 8) + \ + (round_up(SIZE_OF_PAYLOAD_UNION, 8) + \ 8 + \ 8 + \ SIZE_OF_IA_CSS_TIME_MEAS_STRUCT + \ - SIZE_OF_IA_CSS_CLOCK_TICK_STRUCT + \ - CALC_ALIGNMENT_MEMBER(SIZE_OF_IA_CSS_CLOCK_TICK_STRUCT, 8)) + round_up(SIZE_OF_IA_CSS_CLOCK_TICK_STRUCT, 8))static_assert (sizeof (struct sh_css_hmm_buffer ) ==SIZE_OF_SH_CSS_HMM_BUFFER_STRUCT );
drivers/staging/media/atomisp/pci/sh_css_param_dvs.h +11 -8
@@ -7,6 +7,8 @@#ifndef _SH_CSS_PARAMS_DVS_H_#define _SH_CSS_PARAMS_DVS_H_ +#include <linux/math.h> +#include <math_support.h> #include <ia_css_types.h> #include "gdc_global.h" /* gdc_warp_param_mem_t */
@@ -20,16 +22,17 @@/* ISP2400 */ /* horizontal 64x64 blocks round up to DVS_BLOCKDIM_X, make even */ -#define DVS_NUM_BLOCKS_X (X ) (CEIL_MUL(CEIL_DIV((X), DVS_BLOCKDIM_X), 2)) +#define DVS_NUM_BLOCKS_X (X ) round_up(DIV_ROUND_UP((X), DVS_BLOCKDIM_X), 2) +#define DVS_NUM_BLOCKS_X_CHROMA (X ) DIV_ROUND_UP((X), DVS_BLOCKDIM_X)/* ISP2400 */ /* vertical 64x64 blocks round up to DVS_BLOCKDIM_Y */ -#define DVS_NUM_BLOCKS_Y (X ) (CEIL_DIV((X), DVS_BLOCKDIM_Y_LUMA)) -#define DVS_NUM_BLOCKS_X_CHROMA (X ) (CEIL_DIV((X), DVS_BLOCKDIM_X)) -#define DVS_NUM_BLOCKS_Y_CHROMA (X ) (CEIL_DIV((X), DVS_BLOCKDIM_Y_CHROMA)) +#define DVS_NUM_BLOCKS_Y (X ) DIV_ROUND_UP((X), DVS_BLOCKDIM_Y_LUMA) +#define DVS_NUM_BLOCKS_Y_CHROMA (X ) DIV_ROUND_UP((X), DVS_BLOCKDIM_Y_CHROMA) -#define DVS_TABLE_IN_BLOCKDIM_X_LUMA (X ) (DVS_NUM_BLOCKS_X(X) + 1)/* N blocks have N + 1 set of coords */ -#define DVS_TABLE_IN_BLOCKDIM_X_CHROMA (X ) (DVS_NUM_BLOCKS_X_CHROMA(X) + 1) +/* N blocks have N + 1 set of coords */ +#define DVS_TABLE_IN_BLOCKDIM_X_LUMA (X ) (DVS_NUM_BLOCKS_X(X) + 1) +#define DVS_TABLE_IN_BLOCKDIM_X_CHROMA (X ) (DVS_NUM_BLOCKS_X_CHROMA(X) + 1)#define DVS_TABLE_IN_BLOCKDIM_Y_LUMA (X ) (DVS_NUM_BLOCKS_Y(X) + 1)#define DVS_TABLE_IN_BLOCKDIM_Y_CHROMA (X ) (DVS_NUM_BLOCKS_Y_CHROMA(X) + 1)
@@ -40,8 +43,8 @@#define XMEM_ALIGN_LOG2 (5) -#define DVS_6AXIS_COORDS_ELEMS CEIL_MUL(sizeof(gdc_warp_param_mem_t) \ - , HIVE_ISP_DDR_WORD_BYTES) +#define DVS_6AXIS_COORDS_ELEMS \ + round_up(sizeof(gdc_warp_param_mem_t), HIVE_ISP_DDR_WORD_BYTES)/* currently we only support two output with the same resolution, output 0 is th default one. */ #define DVS_6AXIS_BYTES (binary) \
drivers/staging/media/atomisp/pci/sh_css_params.c +6 -6
@@ -4,6 +4,8 @@* Copyright (c) 2015, Intel Corporation. */ +#include <linux/math.h> +#include "gdc_device.h" /* gdc_lut_store(), ... */ #include "isp.h" /* ISP_VEC_ELEMBITS */ #include "vamem.h"
@@ -21,8 +23,6 @@#include "platform_support.h" #include "assert_support.h" -#include "misc_support.h" /* NOT_USED */ -#include "math_support.h" /* max(), min() EVEN_FLOOR()*/ #include "ia_css_stream.h" #include "sh_css_params_internal.h"
@@ -4042,10 +4042,10 @@ sh_css_update_uds_and_crop_info( }/* Must enforce that the crop position is even */ - crop_x =EVEN_FLOOR (crop_x); - crop_y =EVEN_FLOOR (crop_y); - uds_xc =EVEN_FLOOR (uds_xc); - uds_yc =EVEN_FLOOR (uds_yc); + crop_x =round_down (crop_x,2 ); + crop_y =round_down (crop_y,2 ); + uds_xc =round_down (uds_xc,2 ); + uds_yc =round_down (uds_yc,2 ); uds->xc = (uint16_t )uds_xc; uds->yc = (uint16_t )uds_yc;
Signature · 1 line
2.47.2
PATCH v2 3/3 media: atomisp: Remove no more used macros from math_support.h
In reply to Andy ShevchenkoAfter recent cleanups the few macros become unused. Remove them.
--- .../media/atomisp/pci/hive_isp_css_include/math_support.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/media/atomisp/pci/hive_isp_css_include/math_support.h +0 -5
@@ -10,14 +10,9 @@/* Override the definition of max/min from Linux kernel */ #include <linux/minmax.h> -/* force a value to a lower even value */ -#define EVEN_FLOOR (x) ((x) & ~1) -#define CEIL_DIV (a, b) (((b) != 0) ? ((a) + (b) - 1) / (b) : 0)#define CEIL_MUL (a, b) (CEIL_DIV(a, b) * (b)) -#define CEIL_MUL2 (a, b) (((a) + (b) - 1) & ~((b) - 1))#define CEIL_SHIFT (a, b) (((a) + (1 << (b)) - 1) >> (b)) -#define CEIL_SHIFT_MUL (a, b) (CEIL_SHIFT(a, b) << (b))/* * For SP and ISP, SDK provides the definition of OP_std_modadd.
Signature · 1 line
2.47.2
Quoted 6 lines · Andy Shevchenko
Kill unused definitions that may use custom macros from
math_support.hand reduce usage of the latter and even kill some of them at the end of the series.Please, apply only after tests that confirm everything is working as expected.
Hans, have you had any chance to test this?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Hi,
Quoted 10 lines · Andy Shevchenko
Kill unused definitions that may use custom macros from
math_support.hand reduce usage of the latter and even kill some of them at the end of the series.Please, apply only after tests that confirm everything is working as expected.
Changelog v2:
- added a cleanup patch 1
- removed potential div-by-0 conversions
Thanks, patch looks good to me and this time things don't crash during testing:
I have merged the series in my media-atomisp branch:
https://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git/log/?h=media-atomisp
And this series will be included in my next pull-request to Mauro (to media subsystem maintainer)
Regards,
Hans
Quoted 28 lines
v1:
https://lore.kernel.org/linux-media/[email protected]/Andy Shevchenko (3):
media: atomisp: Remove unused header
media: atomisp: Replace macros frommath_support.h
media: atomisp: Remove no more used macros frommath_support.h.../pci/hive_isp_css_include/math_support.h | 5 - .../kernels/anr/anr_1.0/ia_css_anr_types.h | 4 +- .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 6 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 4 +- .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 22 +-- .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 6 +- .../isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 2 +- .../pci/isp/modes/interface/input_buf.isp.h | 6 +- .../pci/isp/modes/interface/isp_const.h | 157 ------------------ .../pci/runtime/debug/src/ia_css_debug.c | 1 - .../atomisp/pci/runtime/frame/src/frame.c | 29 ++-- .../atomisp/pci/runtime/ifmtr/src/ifmtr.c | 11 +- .../pci/runtime/isys/src/virtual_isys.c | 2 +- .../staging/media/atomisp/pci/sh_css_defs.h | 12 +- .../media/atomisp/pci/sh_css_internal.h | 8 +- .../media/atomisp/pci/sh_css_param_dvs.h | 22 +-- .../staging/media/atomisp/pci/sh_css_params.c | 12 +- 17 files changed, 77 insertions(+), 232 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h