diff options
Diffstat (limited to 'include/arch/x86_64/linux/media')
4 files changed, 39 insertions, 74 deletions
diff --git a/include/arch/x86_64/linux/media/amlogic/c3-isp-config.h b/include/arch/x86_64/linux/media/amlogic/c3-isp-config.h index 8fbb487d..7dfac291 100644 --- a/include/arch/x86_64/linux/media/amlogic/c3-isp-config.h +++ b/include/arch/x86_64/linux/media/amlogic/c3-isp-config.h @@ -485,14 +485,11 @@ struct c3_isp_params_blc { * a buffer sized appropriately to accommodate userspace attempting to set all * possible parameters in a single frame. */ -#define C3_ISP_PARAMS_MAX_SIZE \ - (sizeof(struct c3_isp_params_awb_gains) + \ - sizeof(struct c3_isp_params_awb_config) + \ - sizeof(struct c3_isp_params_ae_config) + \ - sizeof(struct c3_isp_params_af_config) + \ - sizeof(struct c3_isp_params_pst_gamma) + \ - sizeof(struct c3_isp_params_ccm) + sizeof(struct c3_isp_params_csc) + \ - sizeof(struct c3_isp_params_blc)) +#define C3_ISP_PARAMS_MAX_SIZE \ + (sizeof(struct c3_isp_params_awb_gains) + sizeof(struct c3_isp_params_awb_config) + \ + sizeof(struct c3_isp_params_ae_config) + sizeof(struct c3_isp_params_af_config) + \ + sizeof(struct c3_isp_params_pst_gamma) + sizeof(struct c3_isp_params_ccm) + \ + sizeof(struct c3_isp_params_csc) + sizeof(struct c3_isp_params_blc)) /** * struct c3_isp_params_cfg - C3 ISP configuration parameters diff --git a/include/arch/x86_64/linux/media/raspberrypi/pisp_be_config.h b/include/arch/x86_64/linux/media/raspberrypi/pisp_be_config.h index a8c292a3..67c2b6c7 100644 --- a/include/arch/x86_64/linux/media/raspberrypi/pisp_be_config.h +++ b/include/arch/x86_64/linux/media/raspberrypi/pisp_be_config.h @@ -88,11 +88,7 @@ enum pisp_be_rgb_enable { * We use the enable flags to show when blocks are "dirty", but we need some * extra ones too. */ -enum pisp_be_dirty { - PISP_BE_DIRTY_GLOBAL = 0x0001, - PISP_BE_DIRTY_SH_FC_COMBINE = 0x0002, - PISP_BE_DIRTY_CROP = 0x0004 -}; +enum pisp_be_dirty { PISP_BE_DIRTY_GLOBAL = 0x0001, PISP_BE_DIRTY_SH_FC_COMBINE = 0x0002, PISP_BE_DIRTY_CROP = 0x0004 }; /** * struct pisp_be_global_config - PiSP global enable bitmaps @@ -683,8 +679,7 @@ enum pisp_be_transform { PISP_BE_TRANSFORM_NONE = 0x0, PISP_BE_TRANSFORM_HFLIP = 0x1, PISP_BE_TRANSFORM_VFLIP = 0x2, - PISP_BE_TRANSFORM_ROT180 = - (PISP_BE_TRANSFORM_HFLIP | PISP_BE_TRANSFORM_VFLIP) + PISP_BE_TRANSFORM_ROT180 = (PISP_BE_TRANSFORM_HFLIP | PISP_BE_TRANSFORM_VFLIP) }; struct pisp_be_output_format_config { @@ -782,8 +777,7 @@ struct pisp_be_config { struct pisp_be_stitch_input_buffer_config stitch_input_buffer; struct pisp_be_tdn_output_buffer_config tdn_output_buffer; struct pisp_be_stitch_output_buffer_config stitch_output_buffer; - struct pisp_be_output_buffer_config - output_buffer[PISP_BACK_END_NUM_OUTPUTS]; + struct pisp_be_output_buffer_config output_buffer[PISP_BACK_END_NUM_OUTPUTS]; struct pisp_be_hog_buffer_config hog_buffer; /* Processing configuration: */ struct pisp_be_global_config global; @@ -821,15 +815,13 @@ struct pisp_be_config { struct pisp_be_ccm_config csc[PISP_BACK_END_NUM_OUTPUTS]; struct pisp_be_downscale_config downscale[PISP_BACK_END_NUM_OUTPUTS]; struct pisp_be_resample_config resample[PISP_BACK_END_NUM_OUTPUTS]; - struct pisp_be_output_format_config - output_format[PISP_BACK_END_NUM_OUTPUTS]; + struct pisp_be_output_format_config output_format[PISP_BACK_END_NUM_OUTPUTS]; struct pisp_be_hog_config hog; struct pisp_be_axi_config axi; /* Non-register fields: */ struct pisp_be_lsc_extra lsc_extra; struct pisp_be_cac_extra cac_extra; - struct pisp_be_downscale_extra - downscale_extra[PISP_BACK_END_NUM_OUTPUTS]; + struct pisp_be_downscale_extra downscale_extra[PISP_BACK_END_NUM_OUTPUTS]; struct pisp_be_resample_extra resample_extra[PISP_BACK_END_NUM_OUTPUTS]; struct pisp_be_crop_config crop; struct pisp_image_format_config hog_format; diff --git a/include/arch/x86_64/linux/media/raspberrypi/pisp_common.h b/include/arch/x86_64/linux/media/raspberrypi/pisp_common.h index ab172063..8df0f23a 100644 --- a/include/arch/x86_64/linux/media/raspberrypi/pisp_common.h +++ b/include/arch/x86_64/linux/media/raspberrypi/pisp_common.h @@ -88,59 +88,36 @@ enum pisp_image_format { /* Lastly a few specific instantiations of the above. */ PISP_IMAGE_FORMAT_SINGLE_16 = PISP_IMAGE_FORMAT_BPS_16, - PISP_IMAGE_FORMAT_THREE_16 = PISP_IMAGE_FORMAT_BPS_16 | - PISP_IMAGE_FORMAT_THREE_CHANNEL + PISP_IMAGE_FORMAT_THREE_16 = PISP_IMAGE_FORMAT_BPS_16 | PISP_IMAGE_FORMAT_THREE_CHANNEL }; -#define PISP_IMAGE_FORMAT_BPS_8(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_8) -#define PISP_IMAGE_FORMAT_BPS_10(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_10) -#define PISP_IMAGE_FORMAT_BPS_12(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_12) -#define PISP_IMAGE_FORMAT_BPS_16(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_16) -#define PISP_IMAGE_FORMAT_BPS(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) ? \ - 8 + (2 << (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) - 1)) : \ - 8) -#define PISP_IMAGE_FORMAT_SHIFT(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_SHIFT_MASK) / PISP_IMAGE_FORMAT_SHIFT_1) -#define PISP_IMAGE_FORMAT_THREE_CHANNEL(fmt) \ - ((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL) -#define PISP_IMAGE_FORMAT_SINGLE_CHANNEL(fmt) \ - (!((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL)) -#define PISP_IMAGE_FORMAT_COMPRESSED(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_COMPRESSION_MASK) != \ - PISP_IMAGE_FORMAT_UNCOMPRESSED) -#define PISP_IMAGE_FORMAT_SAMPLING_444(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == \ - PISP_IMAGE_FORMAT_SAMPLING_444) -#define PISP_IMAGE_FORMAT_SAMPLING_422(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == \ - PISP_IMAGE_FORMAT_SAMPLING_422) -#define PISP_IMAGE_FORMAT_SAMPLING_420(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == \ - PISP_IMAGE_FORMAT_SAMPLING_420) -#define PISP_IMAGE_FORMAT_ORDER_NORMAL(fmt) \ - (!((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED)) -#define PISP_IMAGE_FORMAT_ORDER_SWAPPED(fmt) \ - ((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED) -#define PISP_IMAGE_FORMAT_INTERLEAVED(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == \ - PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED) -#define PISP_IMAGE_FORMAT_SEMIPLANAR(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == \ - PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR) -#define PISP_IMAGE_FORMAT_PLANAR(fmt) \ - (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == \ - PISP_IMAGE_FORMAT_PLANARITY_PLANAR) -#define PISP_IMAGE_FORMAT_WALLPAPER(fmt) \ - ((fmt) & PISP_IMAGE_FORMAT_WALLPAPER_ROLL) -#define PISP_IMAGE_FORMAT_BPP_32(fmt) ((fmt) & PISP_IMAGE_FORMAT_BPP_32) -#define PISP_IMAGE_FORMAT_HOG(fmt) \ - ((fmt) & \ - (PISP_IMAGE_FORMAT_HOG_SIGNED | PISP_IMAGE_FORMAT_HOG_UNSIGNED)) +#define PISP_IMAGE_FORMAT_BPS_8(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_8) +#define PISP_IMAGE_FORMAT_BPS_10(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_10) +#define PISP_IMAGE_FORMAT_BPS_12(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_12) +#define PISP_IMAGE_FORMAT_BPS_16(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_16) +#define PISP_IMAGE_FORMAT_BPS(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) ? 8 + (2 << (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) - 1)) : 8) +#define PISP_IMAGE_FORMAT_SHIFT(fmt) (((fmt) & PISP_IMAGE_FORMAT_SHIFT_MASK) / PISP_IMAGE_FORMAT_SHIFT_1) +#define PISP_IMAGE_FORMAT_THREE_CHANNEL(fmt) ((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL) +#define PISP_IMAGE_FORMAT_SINGLE_CHANNEL(fmt) (!((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL)) +#define PISP_IMAGE_FORMAT_COMPRESSED(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_COMPRESSION_MASK) != PISP_IMAGE_FORMAT_UNCOMPRESSED) +#define PISP_IMAGE_FORMAT_SAMPLING_444(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == PISP_IMAGE_FORMAT_SAMPLING_444) +#define PISP_IMAGE_FORMAT_SAMPLING_422(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == PISP_IMAGE_FORMAT_SAMPLING_422) +#define PISP_IMAGE_FORMAT_SAMPLING_420(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == PISP_IMAGE_FORMAT_SAMPLING_420) +#define PISP_IMAGE_FORMAT_ORDER_NORMAL(fmt) (!((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED)) +#define PISP_IMAGE_FORMAT_ORDER_SWAPPED(fmt) ((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED) +#define PISP_IMAGE_FORMAT_INTERLEAVED(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED) +#define PISP_IMAGE_FORMAT_SEMIPLANAR(fmt) \ + (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR) +#define PISP_IMAGE_FORMAT_PLANAR(fmt) (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == PISP_IMAGE_FORMAT_PLANARITY_PLANAR) +#define PISP_IMAGE_FORMAT_WALLPAPER(fmt) ((fmt) & PISP_IMAGE_FORMAT_WALLPAPER_ROLL) +#define PISP_IMAGE_FORMAT_BPP_32(fmt) ((fmt) & PISP_IMAGE_FORMAT_BPP_32) +#define PISP_IMAGE_FORMAT_HOG(fmt) ((fmt) & (PISP_IMAGE_FORMAT_HOG_SIGNED | PISP_IMAGE_FORMAT_HOG_UNSIGNED)) #define PISP_WALLPAPER_WIDTH 128 /* in bytes */ diff --git a/include/arch/x86_64/linux/media/raspberrypi/pisp_fe_config.h b/include/arch/x86_64/linux/media/raspberrypi/pisp_fe_config.h index cce9e926..aba7556f 100644 --- a/include/arch/x86_64/linux/media/raspberrypi/pisp_fe_config.h +++ b/include/arch/x86_64/linux/media/raspberrypi/pisp_fe_config.h @@ -179,8 +179,7 @@ struct pisp_fe_floating_stats_region { } __attribute__((packed)); struct pisp_fe_floating_stats_config { - struct pisp_fe_floating_stats_region - regions[PISP_FLOATING_STATS_NUM_ZONES]; + struct pisp_fe_floating_stats_region regions[PISP_FLOATING_STATS_NUM_ZONES]; } __attribute__((packed)); #define PISP_FE_CDAF_NUM_WEIGHTS 8 |