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

media: atomisp: better describe get_frame_info issues

Browse source 
When atomisp is used by a normal client, it fails to get
frame info. However, the information is confusing and misleading,
as there are several wrappers for such function, and the error
could be on different places.

So, improve the error log in order to allow narrowing down
where the error is actually occuring.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-10-29 07:06:38 +01:00
parent fae46cb053
commit 331adc2f40
2 changed files with 43 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/media/atomisp/pci/atomisp_cmd.c
View file

@ -5453,9 +5453,9 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,
else
ret = get_frame_info(asd, output_info);
if (ret) {
dev_err(isp->dev, "get_frame_info %ux%u (padded to %u)\n",
pix->width, pix->height, pix->bytesperline);
return -EINVAL;
dev_err(isp->dev, "__get_frame_info %ux%u (padded to %u) returned %d\n",
pix->width, pix->height, pix->bytesperline, ret);
return ret;
}
atomisp_update_grid_info(asd, pipe_id, source_pad);

73
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
View file

@ -2657,42 +2657,49 @@ static int __get_frame_info(struct atomisp_sub_device *asd,
if (__destroy_pipes(asd, true))
dev_warn(isp->dev, "destroy pipe failed.\n");
if (__create_pipes(asd))
if (__create_pipes(asd)) {
dev_err(isp->dev, "can't create pipes\n");
return -EINVAL;
if (__create_streams(asd))
goto stream_err;
ret = ia_css_pipe_get_info(
asd->stream_env[stream_index]
.pipes[pipe_id], &p_info);
if (!ret) {
switch (type) {
case ATOMISP_CSS_VF_FRAME:
*info = p_info.vf_output_info[0];
dev_dbg(isp->dev, "getting vf frame info.\n");
break;
case ATOMISP_CSS_SECOND_VF_FRAME:
*info = p_info.vf_output_info[1];
dev_dbg(isp->dev, "getting second vf frame info.\n");
break;
case ATOMISP_CSS_OUTPUT_FRAME:
*info = p_info.output_info[0];
dev_dbg(isp->dev, "getting main frame info.\n");
break;
case ATOMISP_CSS_SECOND_OUTPUT_FRAME:
*info = p_info.output_info[1];
dev_dbg(isp->dev, "getting second main frame info.\n");
break;
case ATOMISP_CSS_RAW_FRAME:
*info = p_info.raw_output_info;
dev_dbg(isp->dev, "getting raw frame info.\n");
}
dev_dbg(isp->dev, "get frame info: w=%d, h=%d, num_invalid_frames %d.\n",
info->res.width, info->res.height, p_info.num_invalid_frames);
return 0;
}
if (__create_streams(asd)) {
dev_err(isp->dev, "can't create streams\n");
goto stream_err;
}
ret = ia_css_pipe_get_info(asd->stream_env[stream_index].pipes[pipe_id],
&p_info);
if (ret) {
dev_err(isp->dev, "can't get info from pipe\n");
goto stream_err;
}
switch (type) {
case ATOMISP_CSS_VF_FRAME:
*info = p_info.vf_output_info[0];
dev_dbg(isp->dev, "getting vf frame info.\n");
break;
case ATOMISP_CSS_SECOND_VF_FRAME:
*info = p_info.vf_output_info[1];
dev_dbg(isp->dev, "getting second vf frame info.\n");
break;
case ATOMISP_CSS_OUTPUT_FRAME:
*info = p_info.output_info[0];
dev_dbg(isp->dev, "getting main frame info.\n");
break;
case ATOMISP_CSS_SECOND_OUTPUT_FRAME:
*info = p_info.output_info[1];
dev_dbg(isp->dev, "getting second main frame info.\n");
break;
case ATOMISP_CSS_RAW_FRAME:
*info = p_info.raw_output_info;
dev_dbg(isp->dev, "getting raw frame info.\n");
}
dev_dbg(isp->dev, "get frame info: w=%d, h=%d, num_invalid_frames %d.\n",
info->res.width, info->res.height, p_info.num_invalid_frames);
return 0;
stream_err:
__destroy_pipes(asd, true);
return -EINVAL;