On 14/07/2023 03:50, Yuji Ishikawa wrote:
> Add support to Image Signal Processors of Visconti's Video Input Interface.
> This patch adds vendor specific compound controls
> to configure the image signal processor.
>
> Signed-off-by: Yuji Ishikawa <yuji2.ishikawa@xxxxxxxxxxxxx>
> ---
> Changelog v2:
> - Resend v1 because a patch exceeds size limit.
>
> Changelog v3:
> - Adapted to media control framework
> - Introduced ISP subdevice, capture device
> - Remove private IOCTLs and add vendor specific V4L2 controls
> - Change function name avoiding camelcase and uppercase letters
>
> Changelog v4:
> - Split patches because the v3 patch exceeds size limit
> - Stop using ID number to identify driver instance:
> - Use dynamically allocated structure to hold HW specific context,
> instead of static one.
> - Call HW layer functions with the context structure instead of ID number
>
> Changelog v5:
> - no change
>
> Changelog v6:
> - remove unused macros
> - removed hwd_ and HWD_ prefix
> - update source code documentation
> - Suggestion from Hans Verkuil
> - pointer to userland memory is removed from uAPI arguments
> - style of structure is now "nested" instead of "chained by pointer";
> - use div64_u64 for 64bit division
> - vendor specific controls support TRY_EXT_CTRLS
> - add READ_ONLY flag to GET_CALIBRATION_STATUS control and similar ones
> - human friendry control names for vendor specific controls
> - add initial value to each vendor specific control
> - GET_LAST_CAPTURE_STATUS control is updated asyncnously from workqueue
> - remove EXECUTE_ON_WRITE flag of vendor specific control
> - uAPI: return value of GET_CALIBRATION_STATUS follows common rules of error codes
> - applied v4l2-compliance
> - Suggestion from Sakari Ailus
> - use div64_u64 for 64bit division
> - update copyright's year
> - remove redandunt cast
> - use bool instead of HWD_VIIF_ENABLE/DISABLE
> - simplify comparison to 0
> - simplify statements with trigram operator
> - remove redundant local variables
> - use general integer types instead of u32/s32
> - Suggestion from Laurent Pinchart
> - moved VIIF driver to driver/platform/toshiba/visconti
> - change register access: struct-style to macro-style
> - remove unused type definitions
> - define enums instead of successive macro constants
> - remove redundant parenthesis of macro constant
> - embed struct hwd_res into struct viif_device
> - use xxx_dma instead of xxx_paddr for variable names of IOVA
> - literal value: just 0 instead of 0x0
> - use literal 1 or 0 instead of HWD_VIIF_ENABLE, DISABLE for register access
> - use true or false instead of HWD_VIIF_ENABLE, DISABLE for function calls
> - uAPI: return value of GET_CALIBRATION_STATUS follows common rules of error codes
>
> Changelog v7:
> - remove unused variables
> - split long statements which have multiple logical-OR and trigram operators
>
> .../media/platform/toshiba/visconti/Makefile | 2 +-
> .../media/platform/toshiba/visconti/viif.c | 10 +-
> .../platform/toshiba/visconti/viif_controls.c | 3407 +++++++++++++++++
> .../platform/toshiba/visconti/viif_controls.h | 18 +
> .../platform/toshiba/visconti/viif_isp.c | 15 +-
> 5 files changed, 3435 insertions(+), 17 deletions(-)
> create mode 100644 drivers/media/platform/toshiba/visconti/viif_controls.c
> create mode 100644 drivers/media/platform/toshiba/visconti/viif_controls.h
>
> diff --git a/drivers/media/platform/toshiba/visconti/Makefile b/drivers/media/platform/toshiba/visconti/Makefile
> index 5f2f9199c..a28e6fa84 100644
> --- a/drivers/media/platform/toshiba/visconti/Makefile
> +++ b/drivers/media/platform/toshiba/visconti/Makefile
> @@ -3,6 +3,6 @@
> # Makefile for the Visconti video input device driver
> #
>
> -visconti-viif-objs = viif.o viif_capture.o viif_isp.o viif_csi2rx.o viif_common.o
> +visconti-viif-objs = viif.o viif_capture.o viif_controls.o viif_isp.o viif_csi2rx.o viif_common.o
>
> obj-$(CONFIG_VIDEO_VISCONTI_VIIF) += visconti-viif.o
> diff --git a/drivers/media/platform/toshiba/visconti/viif.c b/drivers/media/platform/toshiba/visconti/viif.c
> index c07dc2626..1b3d61abf 100644
> --- a/drivers/media/platform/toshiba/visconti/viif.c
> +++ b/drivers/media/platform/toshiba/visconti/viif.c
> @@ -18,6 +18,7 @@
>
> #include "viif.h"
> #include "viif_capture.h"
> +#include "viif_controls.h"
> #include "viif_csi2rx.h"
> #include "viif_common.h"
> #include "viif_isp.h"
> @@ -178,12 +179,9 @@ static struct viif_subdev *to_viif_subdev(struct v4l2_async_subdev *asd)
> /* before a userland capture application is trigered by vb2_buffer_done() */
> static void visconti_viif_wthread_l1info(struct work_struct *work)
> {
> - /* called function is implemented by the next patch */
> -/*
> - * struct viif_device *viif_dev = container_of(work, struct viif_device, work);
> - *
> - * visconti_viif_save_l1_info(viif_dev);
> - */
> + struct viif_device *viif_dev = container_of(work, struct viif_device, work);
> +
> + visconti_viif_save_l1_info(viif_dev);
> }
>
> static void viif_vsync_irq_handler_w_isp(struct viif_device *viif_dev)
> diff --git a/drivers/media/platform/toshiba/visconti/viif_controls.c b/drivers/media/platform/toshiba/visconti/viif_controls.c
> new file mode 100644
> index 000000000..3cf10e15c
> --- /dev/null
> +++ b/drivers/media/platform/toshiba/visconti/viif_controls.c
> @@ -0,0 +1,3407 @@
<snip>
> +static int visconti_viif_isp_try_ctrl(struct v4l2_ctrl *ctrl)
> +{
> + struct viif_device *viif_dev = ctrl->priv;
> +
> + switch (ctrl->id) {
> + case V4L2_CID_VISCONTI_VIIF_MAIN_SET_RAWPACK_MODE:
> + return viif_main_set_rawpack_mode_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_INPUT_MODE:
> + return viif_l1_set_input_mode_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_RGB_TO_Y_COEF:
> + return viif_l1_set_rgb_to_y_coef_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_AG_MODE:
> + return viif_l1_set_ag_mode_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_AG:
> + return 0; //no need to check
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_HDRE:
> + return viif_l1_set_hdre_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_IMG_EXTRACTION:
> + return viif_l1_set_img_extraction_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_DPC:
> + return viif_l1_set_dpc_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_PRESET_WHITE_BALANCE:
> + return viif_l1_set_preset_white_balance_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_RAW_COLOR_NOISE_REDUCTION:
> + return viif_l1_set_raw_color_noise_reduction_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_HDRS:
> + return viif_l1_set_hdrs_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_BLACK_LEVEL_CORRECTION:
> + return viif_l1_set_black_level_correction_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_LSC:
> + return viif_l1_set_lsc_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_MAIN_PROCESS:
> + return viif_l1_set_main_process_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_AWB:
> + return viif_l1_set_awb_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_LOCK_AWB_GAIN:
> + return 0;
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_HDRC:
> + return viif_l1_set_hdrc_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_HDRC_LTM:
> + return viif_l1_set_hdrc_ltm_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_GAMMA:
> + return viif_l1_set_gamma_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_IMG_QUALITY_ADJUSTMENT:
> + return viif_l1_set_img_quality_adjustment_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L1_SET_AVG_LUM_GENERATION:
> + return viif_l1_set_avg_lum_generation_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L2_SET_UNDIST:
> + return viif_l2_set_undist_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L2_SET_ROI:
> + return viif_l2_set_roi_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_ISP_L2_SET_GAMMA:
> + return viif_l2_set_gamma_try(viif_dev, ctrl->p_new.p);
> + case V4L2_CID_VISCONTI_VIIF_GET_LAST_CAPTURE_STATUS:
> + return 0;
> + default:
> + pr_info("unknown_ctrl:t: id=%08X val=%d", ctrl->id, ctrl->val);
> + break;
> + }
> + return -EINVAL;
> +}
> +
> +static int visconti_viif_isp_set_ctrl(struct v4l2_ctrl *ctrl)
> +{
> + struct viif_device *viif_dev = ctrl->priv;
> + int ret;
> +
> + pr_info("isp_set_ctrl: %s", ctrl->name);
Don't use pr_info for what is just a debug message! Either drop it, or
replace it with dev_dbg.
> + if (pm_runtime_status_suspended(viif_dev->dev)) {
> + pr_info("warning: visconti viif HW is not powered");
And here pr_info is used for a warning, so shouldn't this be dev_warn?
I see pr_info being used in a lot of places where it doesn't belong and
would just spam the kernel log.
Something to go through for v8.
Regards,
Hans
