diff options
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c index adefa57820a4..1bed027435fd 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c @@ -112,13 +112,13 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, width_b_factor = 1, start_column_b, left_padding = 0; input_formatter_cfg_t if_a_config, if_b_config; - enum ia_css_stream_format input_format; + enum atomisp_input_format input_format; enum ia_css_err err = IA_CSS_SUCCESS; uint8_t if_config_index; /* Determine which input formatter config set is targeted. */ /* Index is equal to the CSI-2 port used. */ - enum ia_css_csi2_port port; + enum mipi_port_id port; if (binary) { cropped_height = binary->in_frame_info.res.height; @@ -141,7 +141,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, if (config->mode == IA_CSS_INPUT_MODE_SENSOR || config->mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR) { port = config->source.port.port; - if_config_index = (uint8_t) (port - IA_CSS_CSI2_PORT0); + if_config_index = (uint8_t) (port - MIPI_PORT0_ID); } else if (config->mode == IA_CSS_INPUT_MODE_MEMORY) { if_config_index = SH_CSS_IF_CONFIG_NOT_NEEDED; } else { @@ -189,7 +189,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, bits_per_pixel = input_formatter_get_alignment(INPUT_FORMATTER0_ID) * 8 / ISP_VEC_NELEMS; switch (input_format) { - case IA_CSS_STREAM_FORMAT_YUV420_8_LEGACY: + case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY: if (two_ppc) { vmem_increment = 1; deinterleaving = 1; @@ -219,9 +219,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, start_column = start_column * deinterleaving / 2; } break; - case IA_CSS_STREAM_FORMAT_YUV420_8: - case IA_CSS_STREAM_FORMAT_YUV420_10: - case IA_CSS_STREAM_FORMAT_YUV420_16: + case ATOMISP_INPUT_FORMAT_YUV420_8: + case ATOMISP_INPUT_FORMAT_YUV420_10: + case ATOMISP_INPUT_FORMAT_YUV420_16: if (two_ppc) { vmem_increment = 1; deinterleaving = 1; @@ -246,9 +246,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, start_column *= deinterleaving; } break; - case IA_CSS_STREAM_FORMAT_YUV422_8: - case IA_CSS_STREAM_FORMAT_YUV422_10: - case IA_CSS_STREAM_FORMAT_YUV422_16: + case ATOMISP_INPUT_FORMAT_YUV422_8: + case ATOMISP_INPUT_FORMAT_YUV422_10: + case ATOMISP_INPUT_FORMAT_YUV422_16: if (two_ppc) { vmem_increment = 1; deinterleaving = 1; @@ -267,11 +267,11 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, start_column *= deinterleaving; } break; - case IA_CSS_STREAM_FORMAT_RGB_444: - case IA_CSS_STREAM_FORMAT_RGB_555: - case IA_CSS_STREAM_FORMAT_RGB_565: - case IA_CSS_STREAM_FORMAT_RGB_666: - case IA_CSS_STREAM_FORMAT_RGB_888: + case ATOMISP_INPUT_FORMAT_RGB_444: + case ATOMISP_INPUT_FORMAT_RGB_555: + case ATOMISP_INPUT_FORMAT_RGB_565: + case ATOMISP_INPUT_FORMAT_RGB_666: + case ATOMISP_INPUT_FORMAT_RGB_888: num_vectors *= 2; if (two_ppc) { deinterleaving = 2; /* BR in if_a, G in if_b */ @@ -293,11 +293,11 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, num_vectors = num_vectors / 2 * deinterleaving; buf_offset_b = buffer_width / 2 / ISP_VEC_NELEMS; break; - case IA_CSS_STREAM_FORMAT_RAW_6: - case IA_CSS_STREAM_FORMAT_RAW_7: - case IA_CSS_STREAM_FORMAT_RAW_8: - case IA_CSS_STREAM_FORMAT_RAW_10: - case IA_CSS_STREAM_FORMAT_RAW_12: + case ATOMISP_INPUT_FORMAT_RAW_6: + case ATOMISP_INPUT_FORMAT_RAW_7: + case ATOMISP_INPUT_FORMAT_RAW_8: + case ATOMISP_INPUT_FORMAT_RAW_10: + case ATOMISP_INPUT_FORMAT_RAW_12: if (two_ppc) { int crop_col = (start_column % 2) == 1; vmem_increment = 2; @@ -332,8 +332,8 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, vectors_per_line = CEIL_DIV(cropped_width, ISP_VEC_NELEMS); vectors_per_line = CEIL_MUL(vectors_per_line, deinterleaving); break; - case IA_CSS_STREAM_FORMAT_RAW_14: - case IA_CSS_STREAM_FORMAT_RAW_16: + case ATOMISP_INPUT_FORMAT_RAW_14: + case ATOMISP_INPUT_FORMAT_RAW_16: if (two_ppc) { num_vectors *= 2; vmem_increment = 1; @@ -350,26 +350,26 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, } buffer_height *= 2; break; - case IA_CSS_STREAM_FORMAT_BINARY_8: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT1: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT2: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT3: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT4: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT5: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT6: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT7: - case IA_CSS_STREAM_FORMAT_GENERIC_SHORT8: - case IA_CSS_STREAM_FORMAT_YUV420_8_SHIFT: - case IA_CSS_STREAM_FORMAT_YUV420_10_SHIFT: - case IA_CSS_STREAM_FORMAT_EMBEDDED: - case IA_CSS_STREAM_FORMAT_USER_DEF1: - case IA_CSS_STREAM_FORMAT_USER_DEF2: - case IA_CSS_STREAM_FORMAT_USER_DEF3: - case IA_CSS_STREAM_FORMAT_USER_DEF4: - case IA_CSS_STREAM_FORMAT_USER_DEF5: - case IA_CSS_STREAM_FORMAT_USER_DEF6: - case IA_CSS_STREAM_FORMAT_USER_DEF7: - case IA_CSS_STREAM_FORMAT_USER_DEF8: + case ATOMISP_INPUT_FORMAT_BINARY_8: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT1: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT2: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT3: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT4: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT5: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT6: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT7: + case ATOMISP_INPUT_FORMAT_GENERIC_SHORT8: + case ATOMISP_INPUT_FORMAT_YUV420_8_SHIFT: + case ATOMISP_INPUT_FORMAT_YUV420_10_SHIFT: + case ATOMISP_INPUT_FORMAT_EMBEDDED: + case ATOMISP_INPUT_FORMAT_USER_DEF1: + case ATOMISP_INPUT_FORMAT_USER_DEF2: + case ATOMISP_INPUT_FORMAT_USER_DEF3: + case ATOMISP_INPUT_FORMAT_USER_DEF4: + case ATOMISP_INPUT_FORMAT_USER_DEF5: + case ATOMISP_INPUT_FORMAT_USER_DEF6: + case ATOMISP_INPUT_FORMAT_USER_DEF7: + case ATOMISP_INPUT_FORMAT_USER_DEF8: break; } if (width_a == 0) @@ -420,9 +420,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, if_a_config.buf_eol_offset = buffer_width * bits_per_pixel / 8 - line_width; if_a_config.is_yuv420_format = - (input_format == IA_CSS_STREAM_FORMAT_YUV420_8) - || (input_format == IA_CSS_STREAM_FORMAT_YUV420_10) - || (input_format == IA_CSS_STREAM_FORMAT_YUV420_16); + (input_format == ATOMISP_INPUT_FORMAT_YUV420_8) + || (input_format == ATOMISP_INPUT_FORMAT_YUV420_10) + || (input_format == ATOMISP_INPUT_FORMAT_YUV420_16); if_a_config.block_no_reqs = (config->mode != IA_CSS_INPUT_MODE_SENSOR); if (two_ppc) { @@ -449,9 +449,9 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, if_b_config.buf_eol_offset = buffer_width * bits_per_pixel / 8 - line_width; if_b_config.is_yuv420_format = - input_format == IA_CSS_STREAM_FORMAT_YUV420_8 - || input_format == IA_CSS_STREAM_FORMAT_YUV420_10 - || input_format == IA_CSS_STREAM_FORMAT_YUV420_16; + input_format == ATOMISP_INPUT_FORMAT_YUV420_8 + || input_format == ATOMISP_INPUT_FORMAT_YUV420_10 + || input_format == ATOMISP_INPUT_FORMAT_YUV420_16; if_b_config.block_no_reqs = (config->mode != IA_CSS_INPUT_MODE_SENSOR); |