kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media: atomisp: add return codes for pipeline config functions

Browse source 
Those functions can internally break, but, as they don't return
errors, internally there are some assert() calls, which is bad,
as it hangs the driver.

So, add return codes there, in preparation for removing such
assert() calls.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-11-05 16:29:14 +00:00
parent f88520495b
commit 874da1fd1d
23 changed files with 87 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.c
View file

@ -36,11 +36,9 @@ ia_css_crop_encode(
to->crop_pos = from->crop_pos;
}
void
ia_css_crop_config(
struct sh_css_isp_crop_isp_config *to,
const struct ia_css_crop_configuration *from,
unsigned int size)
int ia_css_crop_config(struct sh_css_isp_crop_isp_config *to,
const struct ia_css_crop_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
@ -50,6 +48,7 @@ ia_css_crop_config(
/* Assume divisiblity here, may need to generalize to fixed point. */
assert(elems_a % to->port_b.elems == 0);
return 0;
}
int ia_css_crop_configure(const struct ia_css_binary *binary,

8
drivers/staging/media/atomisp/pci/isp/kernels/crop/crop_1.0/ia_css_crop.host.h
View file

@ -28,11 +28,9 @@ ia_css_crop_encode(
const struct ia_css_crop_config *from,
unsigned int size);
void
ia_css_crop_config(
struct sh_css_isp_crop_isp_config *to,
const struct ia_css_crop_configuration *from,
unsigned int size);
int ia_css_crop_config(struct sh_css_isp_crop_isp_config *to,
const struct ia_css_crop_configuration *from,
unsigned int size);
int ia_css_crop_configure(const struct ia_css_binary *binary,
const struct ia_css_frame_info *from);

9
drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c
View file

@ -51,11 +51,9 @@ ia_css_fpn_dump(
"fpn_enabled", fpn->enabled);
}
void
ia_css_fpn_config(
struct sh_css_isp_fpn_isp_config *to,
const struct ia_css_fpn_configuration *from,
unsigned int size)
int ia_css_fpn_config(struct sh_css_isp_fpn_isp_config *to,
const struct ia_css_fpn_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
@ -65,6 +63,7 @@ ia_css_fpn_config(
/* Assume divisiblity here, may need to generalize to fixed point. */
assert(elems_a % to->port_b.elems == 0);
return 0;
}
int ia_css_fpn_configure(const struct ia_css_binary *binary,

8
drivers/staging/media/atomisp/pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h
View file

@ -31,11 +31,9 @@ ia_css_fpn_dump(
const struct sh_css_isp_fpn_params *fpn,
unsigned int level);
void
ia_css_fpn_config(
struct sh_css_isp_fpn_isp_config *to,
const struct ia_css_fpn_configuration *from,
unsigned int size);
int ia_css_fpn_config(struct sh_css_isp_fpn_isp_config *to,
const struct ia_css_fpn_configuration *from,
unsigned int size);
int ia_css_fpn_configure(const struct ia_css_binary *binary,
const struct ia_css_frame_info *from);

7
drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c
View file

@ -22,10 +22,8 @@
#include "ia_css_isp_params.h"
#include "ia_css_frame.h"
void
ia_css_bayer_io_config(
const struct ia_css_binary *binary,
const struct sh_css_binary_args *args)
int ia_css_bayer_io_config(const struct ia_css_binary *binary,
const struct sh_css_binary_args *args)
{
const struct ia_css_frame *in_frame = args->in_frame;
const struct ia_css_frame **out_frames = (const struct ia_css_frame **)
@ -91,4 +89,5 @@ ia_css_bayer_io_config(
"ia_css_bayer_io_config() put part leave:\n");
#endif
}
return 0;
}

6
drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h
View file

@ -21,9 +21,7 @@
#include "ia_css_binary.h"
#include "sh_css_internal.h"
void
ia_css_bayer_io_config(
const struct ia_css_binary *binary,
const struct sh_css_binary_args *args);
int ia_css_bayer_io_config(const struct ia_css_binary *binary,
const struct sh_css_binary_args *args);
#endif /*__BAYER_IO_HOST_H */

7
drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c
View file

@ -22,10 +22,8 @@ more details.
#include "ia_css_isp_params.h"
#include "ia_css_frame.h"
void
ia_css_yuv444_io_config(
const struct ia_css_binary *binary,
const struct sh_css_binary_args *args)
int ia_css_yuv444_io_config(const struct ia_css_binary *binary,
const struct sh_css_binary_args *args)
{
const struct ia_css_frame *in_frame = args->in_frame;
const struct ia_css_frame **out_frames = (const struct ia_css_frame **)
@ -91,4 +89,5 @@ ia_css_yuv444_io_config(
"ia_css_yuv444_io_config() put part leave:\n");
#endif
}
return 0;
}

6
drivers/staging/media/atomisp/pci/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h
View file

@ -21,9 +21,7 @@ more details.
#include "ia_css_binary.h"
#include "sh_css_internal.h"
void
ia_css_yuv444_io_config(
const struct ia_css_binary *binary,
const struct sh_css_binary_args *args);
int ia_css_yuv444_io_config(const struct ia_css_binary *binary,
const struct sh_css_binary_args *args);
#endif /*__YUV44_IO_HOST_H */

31
drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.c
View file

@ -52,11 +52,9 @@ ia_css_output_encode(
to->enable_vflip = from->enable_vflip;
}
void
ia_css_output_config(
struct sh_css_isp_output_isp_config *to,
const struct ia_css_output_configuration *from,
unsigned int size)
int ia_css_output_config(struct sh_css_isp_output_isp_config *to,
const struct ia_css_output_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
@ -69,26 +67,21 @@ ia_css_output_config(
/* Assume divisiblity here, may need to generalize to fixed point. */
assert(elems_a % to->port_b.elems == 0);
return 0;
}
void
ia_css_output0_config(
struct sh_css_isp_output_isp_config *to,
const struct ia_css_output0_configuration *from,
unsigned int size)
int ia_css_output0_config(struct sh_css_isp_output_isp_config *to,
const struct ia_css_output0_configuration *from,
unsigned int size)
{
ia_css_output_config(
to, (const struct ia_css_output_configuration *)from, size);
return ia_css_output_config(to, (const struct ia_css_output_configuration *)from, size);
}
void
ia_css_output1_config(
struct sh_css_isp_output_isp_config *to,
const struct ia_css_output1_configuration *from,
unsigned int size)
int ia_css_output1_config(struct sh_css_isp_output_isp_config *to,
const struct ia_css_output1_configuration *from,
unsigned int size)
{
ia_css_output_config(
to, (const struct ia_css_output_configuration *)from, size);
return ia_css_output_config(to, (const struct ia_css_output_configuration *)from, size);
}
int ia_css_output_configure(const struct ia_css_binary *binary,

24
drivers/staging/media/atomisp/pci/isp/kernels/output/output_1.0/ia_css_output.host.h
View file

@ -30,23 +30,17 @@ ia_css_output_encode(
const struct ia_css_output_config *from,
unsigned int size);
void
ia_css_output_config(
struct sh_css_isp_output_isp_config *to,
const struct ia_css_output_configuration *from,
unsigned int size);
int ia_css_output_config(struct sh_css_isp_output_isp_config *to,
const struct ia_css_output_configuration *from,
unsigned int size);
void
ia_css_output0_config(
struct sh_css_isp_output_isp_config *to,
const struct ia_css_output0_configuration *from,
unsigned int size);
int ia_css_output0_config(struct sh_css_isp_output_isp_config *to,
const struct ia_css_output0_configuration *from,
unsigned int size);
void
ia_css_output1_config(
struct sh_css_isp_output_isp_config *to,
const struct ia_css_output1_configuration *from,
unsigned int size);
int ia_css_output1_config(struct sh_css_isp_output_isp_config *to,
const struct ia_css_output1_configuration *from,
unsigned int size);
int ia_css_output_configure(const struct ia_css_binary *binary,
const struct ia_css_frame_info *from);

9
drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c
View file

@ -28,11 +28,9 @@ static const struct ia_css_qplane_configuration default_config = {
.pipe = (struct sh_css_sp_pipeline *)NULL,
};
void
ia_css_qplane_config(
struct sh_css_isp_qplane_isp_config *to,
const struct ia_css_qplane_configuration *from,
unsigned int size)
int ia_css_qplane_config(struct sh_css_isp_qplane_isp_config *to,
const struct ia_css_qplane_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
@ -45,6 +43,7 @@ ia_css_qplane_config(
to->inout_port_config = from->pipe->inout_port_config;
to->format = from->info->format;
return 0;
}
int ia_css_qplane_configure(const struct sh_css_sp_pipeline *pipe,

8
drivers/staging/media/atomisp/pci/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h
View file

@ -29,11 +29,9 @@
#include "ia_css_qplane_types.h"
#include "ia_css_qplane_param.h"
void
ia_css_qplane_config(
struct sh_css_isp_qplane_isp_config *to,
const struct ia_css_qplane_configuration *from,
unsigned int size);
int ia_css_qplane_config(struct sh_css_isp_qplane_isp_config *to,
const struct ia_css_qplane_configuration *from,
unsigned int size);
int ia_css_qplane_configure(const struct sh_css_sp_pipeline *pipe,
const struct ia_css_binary *binary,

10
drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
View file

@ -64,11 +64,9 @@ css2isp_stream_format(enum atomisp_input_format from) {
}
}
void
ia_css_raw_config(
struct sh_css_isp_raw_isp_config *to,
const struct ia_css_raw_configuration *from,
unsigned int size)
int ia_css_raw_config(struct sh_css_isp_raw_isp_config *to,
const struct ia_css_raw_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
const struct ia_css_frame_info *in_info = from->in_info;
@ -104,6 +102,8 @@ ia_css_raw_config(
to->start_line = in_info->crop_info.start_line;
to->enable_left_padding = from->enable_left_padding;
#endif
return 0;
}
int ia_css_raw_configure(const struct sh_css_sp_pipeline *pipe,

8
drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.h
View file

@ -21,11 +21,9 @@
#include "ia_css_raw_types.h"
#include "ia_css_raw_param.h"
void
ia_css_raw_config(
struct sh_css_isp_raw_isp_config *to,
const struct ia_css_raw_configuration *from,
unsigned int size);
int ia_css_raw_config(struct sh_css_isp_raw_isp_config *to,
const struct ia_css_raw_configuration *from,
unsigned int size);
int ia_css_raw_configure(const struct sh_css_sp_pipeline *pipe,
const struct ia_css_binary *binary,

9
drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c
View file

@ -22,11 +22,9 @@
#include "isp.h"
#include "ia_css_ref.host.h"
void
ia_css_ref_config(
struct sh_css_isp_ref_isp_config *to,
const struct ia_css_ref_configuration *from,
unsigned int size)
int ia_css_ref_config(struct sh_css_isp_ref_isp_config *to,
const struct ia_css_ref_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS, i;
@ -53,6 +51,7 @@ ia_css_ref_config(
/* Assume divisiblity here, may need to generalize to fixed point. */
assert(elems_a % to->port_b.elems == 0);
return 0;
}
int ia_css_ref_configure(const struct ia_css_binary *binary,

8
drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.h
View file

@ -23,11 +23,9 @@
#include "ia_css_ref_param.h"
#include "ia_css_ref_state.h"
void
ia_css_ref_config(
struct sh_css_isp_ref_isp_config *to,
const struct ia_css_ref_configuration *from,
unsigned int size);
int ia_css_ref_config(struct sh_css_isp_ref_isp_config *to,
const struct ia_css_ref_configuration *from,
unsigned int size);
int ia_css_ref_configure(const struct ia_css_binary *binary,
const struct ia_css_frame * const *ref_frames,

9
drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c
View file

@ -71,11 +71,9 @@ ia_css_tnr_debug_dtrace(
config->threshold_y, config->threshold_uv);
}
void
ia_css_tnr_config(
struct sh_css_isp_tnr_isp_config *to,
const struct ia_css_tnr_configuration *from,
unsigned int size)
int ia_css_tnr_config(struct sh_css_isp_tnr_isp_config *to,
const struct ia_css_tnr_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
unsigned int i;
@ -91,6 +89,7 @@ ia_css_tnr_config(
/* Assume divisiblity here, may need to generalize to fixed point. */
assert(elems_a % to->port_b.elems == 0);
return 0;
}
int ia_css_tnr_configure(const struct ia_css_binary *binary,

8
drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h
View file

@ -39,11 +39,9 @@ ia_css_tnr_debug_dtrace(
const struct ia_css_tnr_config *config,
unsigned int level);
void
ia_css_tnr_config(
struct sh_css_isp_tnr_isp_config *to,
const struct ia_css_tnr_configuration *from,
unsigned int size);
int ia_css_tnr_config(struct sh_css_isp_tnr_isp_config *to,
const struct ia_css_tnr_configuration *from,
unsigned int size);
int ia_css_tnr_configure(const struct ia_css_binary *binary,
const struct ia_css_frame * const *frames);

9
drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
View file

@ -26,11 +26,9 @@
#include "isp.h"
void
ia_css_vf_config(
struct sh_css_isp_vf_isp_config *to,
const struct ia_css_vf_configuration *from,
unsigned int size)
int ia_css_vf_config(struct sh_css_isp_vf_isp_config *to,
const struct ia_css_vf_configuration *from,
unsigned int size)
{
unsigned int elems_a = ISP_VEC_NELEMS;
@ -46,6 +44,7 @@ ia_css_vf_config(
/* Assume divisiblity here, may need to generalize to fixed point. */
assert(elems_a % to->dma.port_b.elems == 0);
}
return 0;
}
/* compute the log2 of the downscale factor needed to get closest

8
drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h
View file

@ -32,11 +32,9 @@ sh_css_vf_downscale_log2(
const struct ia_css_frame_info *vf_info,
unsigned int *downscale_log2);
void
ia_css_vf_config(
struct sh_css_isp_vf_isp_config *to,
const struct ia_css_vf_configuration *from,
unsigned int size);
int ia_css_vf_config(struct sh_css_isp_vf_isp_config *to,
const struct ia_css_vf_configuration *from,
unsigned int size);
int
ia_css_vf_configure(

5
drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h
View file

@ -138,9 +138,8 @@ bool ia_css_frame_is_same_type(
* @param[in] info The frame info
* @return
*/
void ia_css_dma_configure_from_info(
struct dma_port_config *config,
const struct ia_css_frame_info *info);
int ia_css_dma_configure_from_info(struct dma_port_config *config,
const struct ia_css_frame_info *info);
/* ISP2401 */
/* @brief Finds the cropping resolution

7
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c
View file

@ -594,10 +594,8 @@ bool ia_css_frame_is_same_type(const struct ia_css_frame *frame_a,
return is_equal;
}
void
ia_css_dma_configure_from_info(
struct dma_port_config *config,
const struct ia_css_frame_info *info)
int ia_css_dma_configure_from_info(struct dma_port_config *config,
const struct ia_css_frame_info *info)
{
unsigned int is_raw_packed = info->format == IA_CSS_FRAME_FORMAT_RAW_PACKED;
unsigned int bits_per_pixel = is_raw_packed ? info->raw_bit_depth :
@ -611,6 +609,7 @@ ia_css_dma_configure_from_info(
config->width = (uint16_t)info->res.width;
config->crop = 0;
assert(config->width <= info->padded_width);
return 0;
}
/**************************************************************************

3
drivers/staging/media/atomisp/pci/sh_css_sp.c
View file

@ -870,8 +870,7 @@ static int configure_isp_from_args(const struct sh_css_sp_pipeline *pipeline,
ret = ia_css_tnr_configure(binary, args->tnr_frames);
if (ret)
return ret;
ia_css_bayer_io_config(binary, args);
return 0;
return ia_css_bayer_io_config(binary, args);
}
static void